From 8ba078a872148584d1f13e52d0d0e49b3d1abb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Fri, 20 May 2022 11:53:19 +0200 Subject: [PATCH 1/3] use percent-quoted url for download url generation We need to percent-quote base urls because they will be used in named-percent-substitution afterwards. --- osc/build.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/osc/build.py b/osc/build.py index 4f248b6f..890a5e35 100644 --- a/osc/build.py +++ b/osc/build.py @@ -188,12 +188,10 @@ class Buildinfo: self.pathes.append(node.get('project')+"/"+node.get('repository')) # a hash providing the matching URL for specific repos for newer OBS instances if node.get('url'): - url = node.get('url').replace('%', '%%') + baseurl = node.get('url').replace('%', '%%') if config['api_host_options'][apiurl]['downloadurl']: # Add the path element to the download url override. baseurl = config['api_host_options'][apiurl]['downloadurl'] + urlsplit(node.get('url'))[2] - else: - baseurl = node.get('url') self.urls[node.get('project')+"/"+node.get('repository')] = baseurl + '/%(arch)s/%(filename)s' self.vminstall_list = [ dep.name for dep in self.deps if dep.vminstall ] From 7b759dc8bc3bd2ec4d58efb275e8d4ae3c07671b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Fri, 20 May 2022 11:56:10 +0200 Subject: [PATCH 2/3] Prefer list comprehensions --- osc/build.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/osc/build.py b/osc/build.py index 890a5e35..cb651407 100644 --- a/osc/build.py +++ b/osc/build.py @@ -293,14 +293,9 @@ class Pac: def makeurls(self, cachedir, urllist): - - self.urllist = [] self.localdir = '%s/%s/%s/%s' % (cachedir, self.project, self.repository, self.arch) self.fullfilename = os.path.join(self.localdir, self.canonname) - - # remote URLs - for url in urllist: - self.urllist.append(url % self.mp) + self.urllist = [url % self.mp for url in urllist] def __str__(self): return self.name From b7ed6534ebc8dfed2dc9665325b3c4deb946890c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Fri, 20 May 2022 12:00:44 +0200 Subject: [PATCH 3/3] trailing whitespace cleanup --- osc/conf.py | 4 ++-- osc/core.py | 6 +++--- osc/util/packagequery.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osc/conf.py b/osc/conf.py index 8cd6ceb3..4e5c7fcc 100644 --- a/osc/conf.py +++ b/osc/conf.py @@ -318,11 +318,11 @@ apiurl = %(apiurl)s # extra packages to install when building packages locally (osc build) # this corresponds to osc build's -x option and can be overridden with that # -x '' can also be given on the command line to override this setting, or -# you can have an empty setting here. This global setting may leads to +# you can have an empty setting here. This global setting may leads to # dependency problems when the base distro is not providing the package. # => using server side definition via cli_debug_packages substitute rule is # recommended therefore. -#extra-pkgs = +#extra-pkgs = # build platform is used if the platform argument is omitted to osc build #build_repository = %(build_repository)s diff --git a/osc/core.py b/osc/core.py index 10cbabc3..e61af708 100644 --- a/osc/core.py +++ b/osc/core.py @@ -1545,7 +1545,7 @@ class Package: print('Transmitting file data', end=' ') filelist = self.__generate_commitlist(todo_send) sfilelist = self.__send_commitlog(msg, filelist, validate=True) - hash_entries = [e for e in sfilelist.findall('entry') if e.get('hash') is not None] + hash_entries = [e for e in sfilelist.findall('entry') if e.get('hash') is not None] if sfilelist.get('error') and hash_entries: name2elem = dict([(e.get('name'), e) for e in filelist.findall('entry')]) for entry in hash_entries: @@ -3692,7 +3692,7 @@ class metafile: class _URLFactory: # private class which might go away again... def __init__(self, delegate, force_supported=True): - self._delegate = delegate + self._delegate = delegate self._force_supported = force_supported def is_force_supported(self): @@ -5946,7 +5946,7 @@ def get_package_results(apiurl, project, package=None, wait=False, *args, **kwar if not wait or not waiting: break else: - yield xml + yield xml yield xml diff --git a/osc/util/packagequery.py b/osc/util/packagequery.py index 93a439b5..a8c03347 100644 --- a/osc/util/packagequery.py +++ b/osc/util/packagequery.py @@ -158,8 +158,8 @@ class PackageQueryResult: epoch = self.epoch() if epoch is not None and epoch != 0: - evr = epoch + b":" + evr - return evr + evr = epoch + b":" + evr + return evr def cmp(a, b):