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

gather: Filter comps group on depsolving input of optional

Browse Source 
This is a follow up of 8bc65a8be5. When
resolving packages that go into optional variant, we only want to skip
filtering groups when working on a top-level variant.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-02-27 12:48:06 +01:00
parent 8b1fb287d3
commit a49bf3d74e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pungi/phases/gather/sources/source_comps.py
View File

@ -36,9 +36,13 @@ class GatherSourceComps(pungi.phases.gather.source.GatherSourceBase):
groups = set() groups = set()
comps = CompsWrapper(self.compose.paths.work.comps(arch=arch)) comps = CompsWrapper(self.compose.paths.work.comps(arch=arch))
if variant is not None and variant.groups: if variant is not None and (variant.groups or variant.type != 'variant'):
# Get packages for a particular variant. If the variant has no # Get packages for a particular variant. We want to skip the
# groups listed, all groups will be used. # filtering if the variant is top-level and has no groups (to use
# all of them).
# For optional we always want to filter (and parent groups will be
# added later), for addons and layered products it makes no sense
# for the groups to be empty in the first place.
comps.filter_groups(variant.groups) comps.filter_groups(variant.groups)
for i in comps.get_comps_groups(): for i in comps.get_comps_groups():