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

avoid traceback when cli fails to parse task parameters

Browse source 
also, fix parameter parsing for createLiveCD and createAppliance
This commit is contained in:
Mike McLean 2016-01-11 14:30:55 -05:00
parent 33cf1ab6f2
commit a6c218df94
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cli/koji
View file

@ -4224,7 +4224,18 @@ def _handleOpts(lines, opts, prefix=''):
lines.append("%sOptions:" % prefix)
_handleMap(lines, opts, prefix)
def _parseTaskParams(session, method, task_id):
try:
return _do_parseTaskParams(session, method, task_id)
except Exception:
if logger.isEnabledFor(logging.DEBUG):
tb_str = ''.join(traceback.format_exception(*sys.exc_info()))
logger.debug(tb_str)
return ['Unable to parse task parameters']
def _do_parseTaskParams(session, method, task_id):
"""Parse the return of getTaskRequest()"""
params = session.getTaskRequest(task_id)
@ -4301,11 +4312,10 @@ def _parseTaskParams(session, method, task_id):
if len(params) > 2:
_handleOpts(lines, params[2])
elif method in ('createLiveCD', 'createAppliance'):
lines.append("Arch: %s" % params[0])
lines.append("Build Target: %s" % params[1])
lines.append("Kickstart File: %s" % params[2])
if len(params) > 3:
_handleOpts(lines, params[3])
lines.append("Arch: %s" % params[3])
lines.append("Kickstart File: %s" % params[7])
if len(params) > 8:
_handleOpts(lines, params[8])
elif method == 'newRepo':
tag = session.getTag(params[0])
lines.append("Tag: %s" % tag['name'])