From 9f9b784e647853c1dfd2f5fff1b4ca44cef123f8 Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: Mar 25 2019 07:48:16 +0000 Subject: Remove configuration for devel modules They should be loaded in the same way as regular modules straight from Koji. Signed-off-by: Lubomír Sedlář --- diff --git a/pungi/checks.py b/pungi/checks.py index 66b8c00..715fc85 100644 --- a/pungi/checks.py +++ b/pungi/checks.py @@ -634,10 +634,6 @@ def make_schema(): "type": "boolean", "default": False, }, - "include_devel_modules": { - "type": "object", - "default": {}, - }, "pkgset_source": { "type": "string", diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index 4cbcf4c..2ae90dc 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -643,9 +643,7 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event): event, inherit=should_inherit, logfile=logfile, - exclude_packages=module_tag_rpm_filter.get(compose_tag) - if not compose.conf["include_devel_modules"] - else None, + exclude_packages=module_tag_rpm_filter.get(compose_tag), ) for variant in compose.all_variants.values(): if compose_tag in variant_tags[variant]: