almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

gather: Detect hybrid variant with additional packages

Browse Source 
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ář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2018-07-26 09:12:10 -04:00
parent 80c3fd1170
commit 4d4c6555e2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pungi/phases/gather/methods/method_deps.py
View File

@ -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.