From a9415eb0e556afbf55d564914a3db73c2868f70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 20 Jan 2017 09:07:12 +0100 Subject: [PATCH] Simplify add_multilib_package method 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 | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pungi/gather_dnf.py b/pungi/gather_dnf.py index bc8f1947..83e2d71b 100644 --- a/pungi/gather_dnf.py +++ b/pungi/gather_dnf.py @@ -688,30 +688,29 @@ class Gather(GatherBase): added = set() for pkg in sorted(self.result_binary_packages): - try: - self.finished_add_multilib_packages[pkg] - except KeyError: + if pkg in self.finished_add_multilib_packages: + continue - if pkg.arch in ("noarch", "src", "nosrc"): - self.finished_add_multilib_packages[pkg] = None - continue + if pkg.arch in ("noarch", "src", "nosrc"): + self.finished_add_multilib_packages[pkg] = None + continue - if pkg.arch in self.dnf.arch_wrapper.multilib_arches: - self.finished_add_multilib_packages[pkg] = None - continue + if pkg.arch in self.dnf.arch_wrapper.multilib_arches: + self.finished_add_multilib_packages[pkg] = None + continue - pkgs = self.q_multilib_binary_packages_cache.get(pkg.name, pkg.version, pkg.release) - pkgs = self._get_best_package(pkgs) - multilib_pkgs = [] - for i in pkgs: - is_multilib = self._multilib.is_multilib(i) - if is_multilib: - multilib_pkgs.append(i) - added.add(i) - self._set_flag(i, PkgFlag.multilib) - self._add_packages([i]) - self.finished_add_multilib_packages[pkg] = i - # TODO: ^^^ may get multiple results; i686, i586, etc. + pkgs = self.q_multilib_binary_packages_cache.get(pkg.name, pkg.version, pkg.release) + pkgs = self._get_best_package(pkgs) + multilib_pkgs = [] + for i in pkgs: + is_multilib = self._multilib.is_multilib(i) + if is_multilib: + multilib_pkgs.append(i) + added.add(i) + self._set_flag(i, PkgFlag.multilib) + self._add_packages([i]) + self.finished_add_multilib_packages[pkg] = i + # TODO: ^^^ may get multiple results; i686, i586, etc. return added