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

Remove comps groups from purely modular variants

Browse Source 
The comps source should not return all groups when there are only
modules defined. This fixes part of the problem: non-modular packages
will not go in by default.

The second part is the comps file in the created repository. It will be
filtered to not contain any groups (because packages from there will not
be in the repo).

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2018-03-02 08:33:37 +01:00
parent 3201648c37
commit bd852f4059
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,8 @@ class GatherSourceComps(pungi.phases.gather.source.GatherSourceBase):
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 or variant.type != 'variant'): is_modular = variant and not variant.groups and variant.modules
if variant is not None and (variant.groups or variant.type != 'variant' or is_modular):
# Get packages for a particular variant. We want to skip the # Get packages for a particular variant. We want to skip the
# filtering if the variant is top-level and has no groups (to use # filtering if the variant is top-level and has no groups (to use
# all of them). # all of them).

6
pungi/phases/init.py
View File

@ -45,12 +45,16 @@ class InitPhase(PhaseBase):
# write variant comps # write variant comps
for variant in self.compose.get_variants(): for variant in self.compose.get_variants():
is_modular = not variant.groups and variant.modules
for arch in variant.arches: for arch in variant.arches:
if variant.groups or variant.type == 'optional': if variant.groups or variant.type == 'optional' or is_modular:
# The variant lists only some groups, run filter. Other # The variant lists only some groups, run filter. Other
# option is that it's optional variant, in which case # option is that it's optional variant, in which case
# we want to filter everything (unless there was # we want to filter everything (unless there was
# explicit list in which case it will be used). # explicit list in which case it will be used).
# For fully modular variant (one without groups but
# with modules) we also want to filter (effectively
# producing empty comps).
write_variant_comps(self.compose, arch, variant) write_variant_comps(self.compose, arch, variant)
else: else:
# The variant does not mention any groups, copy # The variant does not mention any groups, copy

1
tests/test_initphase.py
View File

@ -53,6 +53,7 @@ class TestInitPhase(PungiTestCase):
compose = DummyCompose(self.topdir, {}) compose = DummyCompose(self.topdir, {})
compose.has_comps = True compose.has_comps = True
compose.variants['Everything'].groups = [] compose.variants['Everything'].groups = []
compose.variants['Everything'].modules = []
phase = init.InitPhase(compose) phase = init.InitPhase(compose)
phase.run() phase.run()