From 6223baa2ba97e197ae00ada29c1746e8bfe348c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 23 Apr 2024 08:47:30 +0200 Subject: [PATCH] gather: Skip lookaside packages from local lookaside repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When variant X depends on variant A, Pungi creates a temporary local lookaside with packages from A. If there's an external lookaside configured, the list of package for variant A can contain URLs to the external repo. Newer versions of createrepo fail when pkglist specifies an unreachable package, and it doesn't do downloading. JIRA: RHELCMP-13648 Signed-off-by: Lubomír Sedlář (cherry picked from commit 4a5106375e5f199032c97fc253b33351fa18cdde) --- pungi/phases/gather/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pungi/phases/gather/__init__.py b/pungi/phases/gather/__init__.py index 933af196..f4d48a91 100644 --- a/pungi/phases/gather/__init__.py +++ b/pungi/phases/gather/__init__.py @@ -666,6 +666,11 @@ def _make_lookaside_repo(compose, variant, arch, pkg_map, package_sets=None): # we need a union of all SRPMs. if pkg_type == "srpm" or pkg_arch == arch: for pkg in packages: + if "lookaside" in pkg.get("flags", []): + # We want to ignore lookaside packages, those will + # be visible to the depending variants from the + # lookaside repo directly. + continue pkg = pkg["path"] if path_prefix and pkg.startswith(path_prefix): pkg = pkg[len(path_prefix) :]