From 208ec10f92d35dda3e7cc2aca356300036047ab3 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 02 2020 08:31:41 +0000 Subject: kojira: be tolerant of old with_src configuration option Fixes https://pagure.io/koji/issue/2120 --- diff --git a/util/kojira b/util/kojira index 26d3cbd..87c5e77 100755 --- a/util/kojira +++ b/util/kojira @@ -39,7 +39,7 @@ from optparse import OptionParser import six import koji -from koji.util import parseStatus, rmtree, to_list +from koji.util import deprecated, parseStatus, rmtree, to_list tag_cache = {} @@ -957,6 +957,7 @@ def get_options(): 'source_tags', 'separate_source_tags', 'ignore_tags') # FIXME: remove ca here bool_opts = ('verbose', 'debug', 'ignore_stray_repos', 'offline_retry', 'krb_rdns', 'krb_canon_host', 'no_ssl_verify') + legacy_opts = ('with_src') for name in config.options(section): if name in int_opts: defaults[name] = config.getint(section, name) @@ -964,6 +965,8 @@ def get_options(): defaults[name] = config.get(section, name) elif name in bool_opts: defaults[name] = config.getboolean(section, name) + elif name in legacy_opts: + deprecated('The %s configuration option is no longer used\n' % name) else: quit("unknown config option: %s" % name) for name, value in defaults.items():