fix cli display for generic archives

This commit is contained in:
Mike McLean 2016-05-17 11:52:19 -04:00
parent 58460b2397
commit 7ee28e0e14

View file

@ -3299,15 +3299,18 @@ def anon_handle_buildinfo(options, session, args):
print "Tags: %s" % ' '.join(taglist)
if info.get('extra'):
print "Extra: %(extra)r" % info
archives_seen = {}
maven_archives = session.listArchives(buildID=info['id'], type='maven')
if maven_archives:
print "Maven archives:"
for archive in maven_archives:
archives_seen.setdefault(archive['id'], 1)
print os.path.join(koji.pathinfo.mavenbuild(info), koji.pathinfo.mavenfile(archive))
win_archives = session.listArchives(buildID=info['id'], type='win')
if win_archives:
print "Windows archives:"
for archive in win_archives:
archives_seen.setdefault(archive['id'], 1)
print os.path.join(koji.pathinfo.winbuild(info), koji.pathinfo.winfile(archive))
rpms = session.listRPMs(buildID=info['id'])
image_info = session.getImageBuild(info['id'])
@ -3315,7 +3318,14 @@ def anon_handle_buildinfo(options, session, args):
if img_archives:
print 'Image archives:'
for archive in img_archives:
archives_seen.setdefault(archive['id'], 1)
print os.path.join(koji.pathinfo.imagebuild(info), archive['filename'])
other_archives = session.listArchives(buildID=info['id'])
other_archives = [a for a in other_archives if a['id'] not in archives_seen]
if other_archives:
print 'Archives:'
for archive in other_archives:
print os.path.join(koji.pathinfo.buildfiles(info), archive['filename'])
if rpms:
print "RPMs:"
for rpm in rpms: