diff --git a/pungi/arch_utils.py b/pungi/arch_utils.py index f4144b61..e3b86362 100644 --- a/pungi/arch_utils.py +++ b/pungi/arch_utils.py @@ -320,6 +320,7 @@ def getCanonArch(skipRpmPlatform=0): # pragma: no cover return arch + canonArch = getCanonArch() diff --git a/pungi/gather.py b/pungi/gather.py index 2c68561c..a2721534 100644 --- a/pungi/gather.py +++ b/pungi/gather.py @@ -33,6 +33,7 @@ import multilib_yum as multilib import pungi.util from pungi.wrappers.createrepo import CreaterepoWrapper + class ReentrantYumLock(object): """ A lock that can be acquired multiple times by the same process. """ @@ -212,6 +213,7 @@ class PungiYum(yum.YumBase): result[0:1] = result[0:1:-1] return result + class Pungi(PungiBase): def __init__(self, config, ksparser): PungiBase.__init__(self, config) @@ -248,7 +250,6 @@ class Pungi(PungiBase): self.config.get('pungi', 'version'), '.composeinfo') - self.ksparser = ksparser self.resolved_deps = {} # list the deps we've already resolved, short circuit @@ -1393,8 +1394,6 @@ class Pungi(PungiBase): def writeinfo(self, line): """Append a line to the infofile in self.infofile""" - - f=open(self.infofile, "a+") f.write(line.strip() + "\n") f.close() diff --git a/pungi/multilib_yum.py b/pungi/multilib_yum.py index 6c74e661..3247a8d3 100755 --- a/pungi/multilib_yum.py +++ b/pungi/multilib_yum.py @@ -21,7 +21,6 @@ import pungi.gather import pungi.util - LINE_PATTERN_RE = re.compile(r"^\s*(?P[^#]+)(:?\s+(?P#.*))?$") RUNTIME_PATTERN_SPLIT_RE = re.compile(r"^\s*(?P[^\s]+)\s+(?P[^\s]+)(:?\s+(?P#.*))?$") SONAME_PATTERN_RE = re.compile(r"^(.+\.so\.[a-zA-Z0-9_\.]+).*$") @@ -248,6 +247,7 @@ class DevelMultilibMethod(MultilibMethodBase): DEFAULT_METHODS = ["devel", "runtime"] METHOD_MAP = {} + def init(config_path="/usr/share/pungi/multilib/"): global METHOD_MAP diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py index 4a98efbf..e8b54e1d 100644 --- a/pungi/wrappers/kojiwrapper.py +++ b/pungi/wrappers/kojiwrapper.py @@ -581,7 +581,6 @@ class KojiWrapper(object): return results - @util.retry(wait_on=(xmlrpclib.ProtocolError, koji.GenericError)) def retrying_multicall_map(self, *args, **kwargs): """ @@ -593,7 +592,6 @@ class KojiWrapper(object): return self.multicall_map(*args, **kwargs) - def get_buildroot_rpms(compose, task_id): """Get build root RPMs - either from runroot or local""" result = []