From 428f8297e139869d22683c68754b21e6a3e7c890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 27 Sep 2019 13:54:43 +0200 Subject: [PATCH] gather: Simplify adding packages to result MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/gather_dnf.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pungi/gather_dnf.py b/pungi/gather_dnf.py index b706d6c9..69c752a3 100644 --- a/pungi/gather_dnf.py +++ b/pungi/gather_dnf.py @@ -287,12 +287,11 @@ class Gather(GatherBase): return [i for i in multilib_pkgs if i.sourcerpm == match.sourcerpm] return [match] - def _add_packages(self, packages, pulled_by=None, req=None, reason=None): - added = set() + def _add_packages(self, packages, pulled_by=None, req=None, reason=None, dest=None): + dest = dest or self.result_binary_packages for i in packages: assert i is not None - if i not in self.result_binary_packages: - added.add(i) + if i not in dest: pb = "" if pulled_by: pb = " (pulled by %s, repo: %s)" % (pulled_by, pulled_by.repo.id) @@ -301,15 +300,13 @@ class Gather(GatherBase): if reason: pb += " (%s)" % reason self.logger.debug("Added package %s%s" % (i, pb)) - self.result_binary_packages.add(i) + dest.add(i) # lookaside if i.repoid in self.opts.lookaside_repos: self._set_flag(i, PkgFlag.lookaside) if i.sourcerpm.rsplit('-', 2)[0] in self.opts.fulltree_excludes: self._set_flag(i, PkgFlag.fulltree_exclude) - self.result_binary_packages.update(added) - def _get_package_deps(self, pkg): """Return all direct (1st level) deps for a package.