particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR#2816: koji-gc: Allow specifying all CLI options in config

Browse source 
Merges #2816
https://pagure.io/koji/pull-request/2816

Fixes: #2814
https://pagure.io/koji/issue/2814
koji-gc: ignore_tags not possible to specify in the config
This commit is contained in:
Tomas Kopecek 2021-04-28 13:09:30 +02:00
commit e10809c5b8
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
util/koji-gc
View file

@ -119,6 +119,8 @@ def get_options():
# List of values read from config file to update default parser values
cfgmap = [
# name, alias, type
['test', None, 'boolean'],
['debug', None, 'boolean'],
['keytab', None, 'string'],
['principal', None, 'string'],
['runas', None, 'string'],
@ -133,15 +135,20 @@ def get_options():
['smtp_user', None, 'string'],
['smtp_pass', None, 'string'],
['from_addr', None, 'string'],
['cc_addr', None, 'string'],
['bcc_addr', None, 'string'],
['cc_addr', None, 'list'],
['bcc_addr', None, 'list'],
['email_template', None, 'string'],
['email_domain', None, 'string'],
['mail', None, 'boolean'],
['delay', None, 'string'],
['unprotected_keys', None, 'string'],
['tag_filter', None, 'list'],
['ignore_tags', None, 'list'],
['pkg_filter', None, 'list'],
['bypass_locks', None, 'list'],
['grace_period', None, 'string'],
['trashcan_tag', None, 'string'],
['purge', None, 'boolean'],
['no_ssl_verify', None, 'boolean'],
['timeout', None, 'integer'],
['lock_file', None, 'string'],
@ -157,12 +164,13 @@ def get_options():
setattr(defaults, name, config.getint(*alias))
elif type == 'boolean':
setattr(defaults, name, config.getboolean(*alias))
elif type == 'list':
val = config.get(*alias)
if val is not None:
val = val.split(',')
setattr(defaults, name, val)
else:
setattr(defaults, name, config.get(*alias))
if config.has_option('main', 'cc_addr'):
setattr(defaults, 'cc_addr', config.get('main', 'cc_addr').split(','))
if config.has_option('main', 'bcc_addr'):
setattr(defaults, 'bcc_addr', config.get('main', 'bcc_addr').split(','))
# parse again with defaults
(options, args) = parser.parse_args(values=defaults)
options.config = config