#942 init: Stop filtering comps environments all the time
Merged 5 years ago by lsedlar. Opened 5 years ago by lsedlar.
lsedlar/pungi no-filter-env  into  master

file modified
+6 -1
@@ -128,7 +128,12 @@ 

          unmatched = comps.filter_groups(variant.groups)

          for grp in unmatched:

              compose.log_warning(UNMATCHED_GROUP_MSG % (variant.uid, arch, grp))

-     if compose.conf["comps_filter_environments"]:

+     contains_all = not variant.groups and not variant.environments

+     if compose.conf["comps_filter_environments"] and not contains_all:

+         # We only want to filter environments if it's enabled by configuration

+         # and it's a variant with some groups and environements defined. If

+         # there are none, all packages should go in there and also all

+         # environments should be preserved.

          comps.filter_environments(variant.environments)

      comps.write_comps()

  

For variants that contain all packages (Fedora's Everything) we don't want to lose any environments.

Fixes: https://pagure.io/pungi/issue/940

This code is OK for me.

rebased onto fc78a3c

5 years ago

Pretty please pagure-ci rebuild

Pull-Request has been merged by lsedlar

5 years ago