almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

gather: Simplify adding packages to result

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-09-27 13:54:43 +02:00
parent c7f3f38822
commit 428f8297e1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pungi/gather_dnf.py
View File

@ -287,12 +287,11 @@ class Gather(GatherBase):
return [i for i in multilib_pkgs if i.sourcerpm == match.sourcerpm] return [i for i in multilib_pkgs if i.sourcerpm == match.sourcerpm]
return [match] return [match]
def _add_packages(self, packages, pulled_by=None, req=None, reason=None): def _add_packages(self, packages, pulled_by=None, req=None, reason=None, dest=None):
added = set() dest = dest or self.result_binary_packages
for i in packages: for i in packages:
assert i is not None assert i is not None
if i not in self.result_binary_packages: if i not in dest:
added.add(i)
pb = "" pb = ""
if pulled_by: if pulled_by:
pb = " (pulled by %s, repo: %s)" % (pulled_by, pulled_by.repo.id) pb = " (pulled by %s, repo: %s)" % (pulled_by, pulled_by.repo.id)
@ -301,15 +300,13 @@ class Gather(GatherBase):
if reason: if reason:
pb += " (%s)" % reason pb += " (%s)" % reason
self.logger.debug("Added package %s%s" % (i, pb)) self.logger.debug("Added package %s%s" % (i, pb))
self.result_binary_packages.add(i) dest.add(i)
# lookaside # lookaside
if i.repoid in self.opts.lookaside_repos: if i.repoid in self.opts.lookaside_repos:
self._set_flag(i, PkgFlag.lookaside) self._set_flag(i, PkgFlag.lookaside)
if i.sourcerpm.rsplit('-', 2)[0] in self.opts.fulltree_excludes: if i.sourcerpm.rsplit('-', 2)[0] in self.opts.fulltree_excludes:
self._set_flag(i, PkgFlag.fulltree_exclude) self._set_flag(i, PkgFlag.fulltree_exclude)
self.result_binary_packages.update(added)
def _get_package_deps(self, pkg): def _get_package_deps(self, pkg):
"""Return all direct (1st level) deps for a package. """Return all direct (1st level) deps for a package.