From a4476f2570d6c00c71e2fd0a750acd7720a5b3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 27 Feb 2023 15:31:22 +0100 Subject: [PATCH] gather: Better detection of debuginfo in lookaside MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the depsolver wants to include a package that is present in both the source repo and a lookaside repo, it reliably detects binary packages present in lookaside, but for debuginfo it's not so reliable. There is a separate package object for each package in each repo. Depending on which one is used, debuginfo could be included in the result or not. This patch fixes that by actually looking if the same package is present in any lookaside repo. JIRA: RHELCMP-9373 Signed-off-by: Lubomír Sedlář --- pungi/gather_dnf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pungi/gather_dnf.py b/pungi/gather_dnf.py index d718dcdc..06795015 100644 --- a/pungi/gather_dnf.py +++ b/pungi/gather_dnf.py @@ -783,7 +783,6 @@ class Gather(GatherBase): continue debug_pkgs = [] - pkg_in_lookaside = pkg.repoid in self.opts.lookaside_repos for i in candidates: if pkg.arch != i.arch: continue @@ -791,7 +790,7 @@ class Gather(GatherBase): # If it's not debugsource package or does not match name of # the package, we don't want it in. continue - if i.repoid in self.opts.lookaside_repos or pkg_in_lookaside: + if self.is_from_lookaside(i): self._set_flag(i, PkgFlag.lookaside) if i not in self.result_debug_packages: added.add(i)