From 303fb29a6cd2bb25c68db4e8e5f1817cf44b905c Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 15 Feb 2018 15:39:40 -0500 Subject: [PATCH] source_koji.py: Properly handle unset pkgset_koji_tag In one place, there was an explicit check if pkgset_koji_tag was set, in another it was blindly referenced and assumed to be a list (with accidental semi-success for a scalar.) Signed-off-by: Owen W. Taylor --- pungi/phases/pkgset/sources/source_koji.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index 8a706a61..7d222907 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -274,7 +274,8 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id): if not variant_tags[variant]: variant_tags[variant].extend(force_list(compose.conf["pkgset_koji_tag"])) - # Add global tag if supplied. + # Add global tag(s) if supplied. + global_tags = [] if 'pkgset_koji_tag' in compose.conf: if compose.conf["pkgset_koji_tag"] == "not-used": # The magic value is used for modular composes to avoid errors @@ -283,7 +284,8 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id): 'option is no longer required. Remove it from ' 'the configuration.') else: - compose_tags.extend(force_list(compose.conf["pkgset_koji_tag"])) + global_tags = force_list(compose.conf["pkgset_koji_tag"]) + compose_tags.extend(global_tags) inherit = compose.conf["pkgset_koji_inherit"] global_pkgset_path = os.path.join( @@ -328,7 +330,7 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id): global_pkgset = pkgset else: global_pkgset.merge(pkgset, None, list(all_arches), - unique_name=compose_tag in compose.conf['pkgset_koji_tag']) + unique_name=compose_tag in global_tags) with open(global_pkgset_path, 'wb') as f: data = pickle.dumps(global_pkgset) f.write(data)