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

Remove not-used hack to workaround required option

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-07-26 16:07:40 +02:00
parent e674c2f574
commit 51d638d5db
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,15 +575,8 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
# Add global tag(s) if supplied. # Add global tag(s) if supplied.
pkgset_koji_tags = [] pkgset_koji_tags = []
if 'pkgset_koji_tag' in compose.conf: if 'pkgset_koji_tag' in compose.conf:
if compose.conf["pkgset_koji_tag"] == "not-used": pkgset_koji_tags = force_list(compose.conf["pkgset_koji_tag"])
# The magic value is used for modular composes to avoid errors compose_tags.extend(pkgset_koji_tags)
# about missing option. It should be removed in next version.
compose.log_warning('pkgset_koji_tag is set to "not-used", but the '
'option is no longer required. Remove it from '
'the configuration.')
else:
pkgset_koji_tags = force_list(compose.conf["pkgset_koji_tag"])
compose_tags.extend(pkgset_koji_tags)
inherit = compose.conf["pkgset_koji_inherit"] inherit = compose.conf["pkgset_koji_inherit"]
inherit_modules = compose.conf["pkgset_koji_inherit_modules"] inherit_modules = compose.conf["pkgset_koji_inherit_modules"]