robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pkgset: Fix running without any koji tags

Browse source 
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>
This commit is contained in:
Lubomír Sedlář 2019-11-11 08:34:35 +01:00
parent 254d0cebff
commit d34b0d7900
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pungi/phases/pkgset/sources/source_koji.py
View file

@ -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"]