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

mock.module_setup_commands tag extra option

Browse source 
Fixes: https://pagure.io/koji/issue/2483
This commit is contained in:
Tomas Kopecek 2021-09-20 15:17:10 +02:00
parent 0ea9b1f056
commit 3ee95baa5f
7 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cli/koji_cli/commands.py
View file

@ -1147,6 +1147,8 @@ def anon_handle_mock_config(goptions, session, args):
opts['bootstrap_image'] = buildcfg['extra']['mock.bootstrap_image']
if 'mock.use_bootstrap' in buildcfg['extra']:
opts['use_bootstrap'] = buildcfg['extra']['mock.use_bootstrap']
if 'mock.module_setup_commands' in buildcfg['extra']:
opts['module_setup_commands'] = buildcfg['extra']['mock.module_setup_commands']
opts['tag_macros'] = {}
for key in buildcfg['extra']:
if key.startswith('rpm.macro.'):
@ -5305,7 +5307,7 @@ def handle_edit_tag(goptions, session, args):
parser.add_option("--no-include-all", action="store_true",
help="Do not include all packages in this tag when generating Maven repos")
parser.add_option("-x", "--extra", action="append", default=[], metavar="key=value",
help="Set tag extra option")
help="Set tag extra option. JSON-encoded or simple value")
parser.add_option("-r", "--remove-extra", action="append", default=[], metavar="key",
help="Remove tag extra option")
parser.add_option("-b", "--block-extra", action="append", default=[], metavar="key",
@ -5340,8 +5342,9 @@ def handle_edit_tag(goptions, session, args):
extra = {}
for xopt in options.extra:
key, value = xopt.split('=', 1)
value = arg_filter(value)
extra[key] = value
if key in extra:
parser.error("Duplicate extra key: %s" % key)
extra[key] = arg_filter(value, parse_json=True)
opts['extra'] = extra
opts['remove_extra'] = options.remove_extra
opts['block_extra'] = options.block_extra