44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
|
From d34b0d79002f127fbea4407b17a157dcdaaf045e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lubomír Sedlář <lsedlar@redhat.com>
|
||
|
|
Date: Nov 11 2019 08:30:37 +0000
|
||
|
|
Subject: pkgset: Fix running without any koji tags
|
||
|
|
|
||
|
|
|
||
|
|
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ář <lsedlar@redhat.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py
|
||
|
|
index 187e6f1..c573ad8 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"]
|
||
|
|
|