From 4d4c6555e2c1ea39134abf9482f8c035dd4fa6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 26 Jul 2018 09:12:10 -0400 Subject: [PATCH] gather: Detect hybrid variant with additional packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The check if a variant is hybrid (or modular only) currently only looks at comps groups. However it's possible there will be no comps groups, but packages will be listed explicitly in config as additional_packages. Relates: RCM-37979 Signed-off-by: Lubomír Sedlář --- pungi/phases/gather/methods/method_deps.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pungi/phases/gather/methods/method_deps.py b/pungi/phases/gather/methods/method_deps.py index 7b1709b0..44fb60b2 100644 --- a/pungi/phases/gather/methods/method_deps.py +++ b/pungi/phases/gather/methods/method_deps.py @@ -128,7 +128,11 @@ def write_pungi_config(compose, arch, variant, packages, groups, filter_packages # If the variant contains just modules or just comps groups, the pkgset # is sufficient and contains all necessary packages. - if variant.groups and variant.modules is not None and package_sets: + has_additional_pkgs = get_arch_variant_data( + compose.conf, "additional_packages", arch, variant + ) + has_traditional_content = variant.groups or has_additional_pkgs + if has_traditional_content and variant.modules is not None and package_sets: # The variant is hybrid. The modular builds are already available. # We need to add packages from base tag, but only if they are not # already on the whitelist.