From 51d638d5dbf9befb7d8d55c69eed1860811c42fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 26 Jul 2019 16:07:40 +0200 Subject: [PATCH] Remove not-used hack to workaround required option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/phases/pkgset/sources/source_koji.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index 598d0d09..2c5f9187 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -575,15 +575,8 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event): # Add global tag(s) if supplied. pkgset_koji_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 - # 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) + pkgset_koji_tags = force_list(compose.conf["pkgset_koji_tag"]) + compose_tags.extend(pkgset_koji_tags) inherit = compose.conf["pkgset_koji_inherit"] inherit_modules = compose.conf["pkgset_koji_inherit_modules"]