almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

source_koji.py: Properly handle unset pkgset_koji_tag

Browse Source 
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 <otaylor@fishsoup.net>
This commit is contained in:
Owen W. Taylor 2018-02-15 15:39:40 -05:00
parent cc8c7a702c
commit 303fb29a6c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pungi/phases/pkgset/sources/source_koji.py
View File

@ -274,7 +274,8 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id):
if not variant_tags[variant]: if not variant_tags[variant]:
variant_tags[variant].extend(force_list(compose.conf["pkgset_koji_tag"])) 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 'pkgset_koji_tag' in compose.conf:
if compose.conf["pkgset_koji_tag"] == "not-used": if compose.conf["pkgset_koji_tag"] == "not-used":
# The magic value is used for modular composes to avoid errors # 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 ' 'option is no longer required. Remove it from '
'the configuration.') 'the configuration.')
else: 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"] inherit = compose.conf["pkgset_koji_inherit"]
global_pkgset_path = os.path.join( global_pkgset_path = os.path.join(
@ -328,7 +330,7 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id):
global_pkgset = pkgset global_pkgset = pkgset
else: else:
global_pkgset.merge(pkgset, None, list(all_arches), 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: with open(global_pkgset_path, 'wb') as f:
data = pickle.dumps(global_pkgset) data = pickle.dumps(global_pkgset)
f.write(data) f.write(data)