From c3cf09a2f7c1e5500bfc7a87f9956cf414d8d1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 9 Feb 2017 13:30:07 +0100 Subject: [PATCH] pkgset: Use additional packages for initial pull MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We call pungi to get the packages from external repos if pkgset_source=repos. In this case we need to look at additional packages as well. Signed-off-by: Lubomír Sedlář Fixes: #528 --- pungi/phases/pkgset/sources/source_repos.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pungi/phases/pkgset/sources/source_repos.py b/pungi/phases/pkgset/sources/source_repos.py index efa4f125..35748c47 100644 --- a/pungi/phases/pkgset/sources/source_repos.py +++ b/pungi/phases/pkgset/sources/source_repos.py @@ -25,7 +25,7 @@ from pungi.util import makedirs, is_arch_multilib from pungi.wrappers.pungi import PungiWrapper from pungi.phases.pkgset.common import create_global_repo, create_arch_repos, populate_arch_pkgsets -from pungi.phases.gather import get_prepopulate_packages +from pungi.phases.gather import get_prepopulate_packages, get_additional_packages from pungi.linker import LinkerThread, LinkerPool @@ -159,7 +159,8 @@ def write_pungi_config(compose, arch, variant, repos=None, comps_repo=None, pack packages = [] pkgs, grps = src(arch, variant) - for pkg_name, pkg_arch in pkgs: + additional_packages = get_additional_packages(compose, arch, None) + for pkg_name, pkg_arch in pkgs | additional_packages: if pkg_arch is None: packages.append(pkg_name) else: