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

fix task option ordering for images

Browse source
This commit is contained in:
Jay Greguske 2013-11-06 13:31:50 -05:00 • committed by Mike McLean
parent dce981825a
commit c940c252be
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
koji/__init__.py
View file

@ -2318,10 +2318,23 @@ def _taskLabel(taskInfo):
nvrs = taskInfo['request'][2]
if isinstance(nvrs, list):
extra += ', ' + ', '.join(nvrs)
elif method in ('createLiveCD', 'createAppliance'):
elif method in ('livecd', 'appliance', 'image'):
if taskInfo.has_key('request'):
arch, target, ksfile = taskInfo['request'][:3]
extra = '%s, %s, %s' % (target, arch, os.path.basename(ksfile))
stuff = taskInfo['request']
if method == 'image':
kickstart = os.path.basename(stuff[-1]['kickstart'])
else:
kickstart = os.path.basename(stuff[4])
extra = '%s, %s-%s, %s' % (stuff[3], stuff[0], stuff[1], kickstart)
elif method in ('createLiveCD', 'createAppliance', 'createImage'):
if taskInfo.has_key('request'):
stuff = taskInfo['request']
if method == 'createImage':
kickstart = os.path.basename(stuff[-1]['kickstart'])
else:
kickstart = os.path.basename(stuff[7])
extra = '%s, %s-%s-%s, %s, %s' % (stuff[4]['name'], stuff[0],
stuff[1], stuff[2], kickstart, stuff[3])
elif method == 'restart':
if taskInfo.has_key('request'):
host = taskInfo['request'][0]