diff --git a/bin/pungi-gather b/bin/pungi-gather index 1bf92436..02f9e2cd 100755 --- a/bin/pungi-gather +++ b/bin/pungi-gather @@ -3,7 +3,6 @@ import os -import sys import argparse import pungi.ks diff --git a/pungi/dnf_wrapper.py b/pungi/dnf_wrapper.py index c049a8ad..e804af13 100644 --- a/pungi/dnf_wrapper.py +++ b/pungi/dnf_wrapper.py @@ -15,7 +15,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - # TODO: remove all DNF hacks, possibly this whole file diff --git a/pungi/gather_dnf.py b/pungi/gather_dnf.py index c89c37de..435dc341 100644 --- a/pungi/gather_dnf.py +++ b/pungi/gather_dnf.py @@ -154,7 +154,10 @@ class Gather(GatherBase): self.opts = gather_options self.logger.debug("Gather received gather_options=%s" % gather_options.__dict__) - self._multilib = pungi.multilib_dnf.Multilib(self.dnf._sack, gather_options.multilib_methods, blacklist=self.opts.multilib_blacklist, whitelist=self.opts.multilib_whitelist) + self._multilib = pungi.multilib_dnf.Multilib(self.dnf._sack, + gather_options.multilib_methods, + blacklist=self.opts.multilib_blacklist, + whitelist=self.opts.multilib_whitelist) # already processed packages self.finished_add_binary_package_deps = {} # {pkg: [deps]} @@ -229,10 +232,8 @@ class Gather(GatherBase): if self.opts.greedy_method == "build" and req: if self.is_native_package(match): return [i for i in native_pkgs if i.sourcerpm == match.sourcerpm] -# return list(native_pkgs.filter(sourcerpm=match.sourcerpm, provides=req)) else: return [i for i in multilib_pkgs if i.sourcerpm == match.sourcerpm] -# return list(multilib_pkgs.filter(sourcerpm=match.sourcerpm, provides=req)) return [match] def _add_packages(self, packages, pulled_by=None): diff --git a/pungi/ks.py b/pungi/ks.py index b6043604..ecb8821f 100644 --- a/pungi/ks.py +++ b/pungi/ks.py @@ -72,7 +72,7 @@ Syntax: import pykickstart.parser import pykickstart.sections -from pykickstart.constants import GROUP_REQUIRED, GROUP_DEFAULT, GROUP_ALL +from pykickstart.constants import GROUP_REQUIRED, GROUP_DEFAULT class FulltreeExcludesSection(pykickstart.sections.Section): diff --git a/pungi/wrappers/pungi.py b/pungi/wrappers/pungi.py index 21635c99..60c1ae7a 100644 --- a/pungi/wrappers/pungi.py +++ b/pungi/wrappers/pungi.py @@ -200,7 +200,6 @@ class PungiWrapper(object): return cmd - def get_packages(self, output): global PACKAGES_RE result = dict(((i, []) for i in PACKAGES_RE))