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

CLI mock-config: when topdir option, remove topurl value

Browse source 
Fixes: https://pagure.io/koji/issue/2675
This commit is contained in:
Jana Cupova 2021-11-23 22:25:08 +01:00 • committed by Tomas Kopecek
parent 0b911ed0c4
commit f528fd9ca4
2 changed files with 185 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cli/koji_cli/commands.py
View file

@ -1043,9 +1043,11 @@ def anon_handle_mock_config(goptions, session, args):
parser.add_option("--buildroot",
help="Duplicate the mock config for the specified buildroot id")
parser.add_option("--mockdir", default="/var/lib/mock", metavar="DIR", help="Specify mockdir")
parser.add_option("--topdir", metavar="DIR", help="Specify topdir")
parser.add_option("--topurl", metavar="URL", default=goptions.topurl,
help="URL under which Koji files are accessible")
parser.add_option("--topdir", metavar="DIR",
help="Specify topdir, topdir tops the topurl")
parser.add_option("--topurl", metavar="URL",
help="URL under which Koji files are accessible, "
"when topdir is specified, topdir tops the topurl")
parser.add_option("--distribution", default="Koji Testing",
help="Change the distribution macro")
parser.add_option("--yum-proxy", help="Specify a yum proxy")
@ -1062,7 +1064,12 @@ def anon_handle_mock_config(goptions, session, args):
opts = {}
for k in ('topdir', 'topurl', 'distribution', 'mockdir', 'yum_proxy'):
if hasattr(options, k):
opts[k] = getattr(options, k)
if getattr(options, k) is not None:
opts[k] = getattr(options, k)
if opts.get('topdir') and opts.get('topurl'):
del opts['topurl']
if not opts.get('topdir') and not opts.get('topurl'):
opts['topurl'] = goptions.topurl
if options.buildroot:
try:
br_id = int(options.buildroot)