From d34b0d79002f127fbea4407b17a157dcdaaf045e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 11 Nov 2019 08:34:35 +0100 Subject: [PATCH] pkgset: Fix running without any koji tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All places in the code assume the option to not be required except for this one line. An obsolete comment is removed as well. Relates: https://pagure.io/releng/failed-composes/issue/477 Signed-off-by: Lubomír Sedlář --- pungi/phases/pkgset/sources/source_koji.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index 187e6f1b..c573ad8b 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -588,6 +588,8 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event): tag_to_mmd = {} + pkgset_koji_tags = force_list(compose.conf.get("pkgset_koji_tag", [])) + for variant in compose.all_variants.values(): variant_tags[variant] = [] @@ -617,11 +619,9 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event): if variant_tag not in compose_tags: compose_tags.append(variant_tag) - # TODO check if this works for Fedora Modular variant - variant_tags[variant].extend(force_list(compose.conf["pkgset_koji_tag"])) + variant_tags[variant].extend(pkgset_koji_tags) # Add global tag(s) if supplied. - pkgset_koji_tags = force_list(compose.conf.get("pkgset_koji_tag", [])) compose_tags.extend(pkgset_koji_tags) inherit = compose.conf["pkgset_koji_inherit"]