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

cli rpminfo: handle no srpm case

Browse source
This commit is contained in:
Yu Ming Zhu 2023-11-13 09:41:40 +00:00
parent 0859f1ba89
commit 74ba6c947f
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cli/koji_cli/commands.py
View file

@ -3664,11 +3664,14 @@ def anon_handle_rpminfo(goptions, session, args):
if info['arch'] == 'src': if info['arch'] == 'src':
srpminfo = info.copy() srpminfo = info.copy()
else: else:
srpminfo = session.listRPMs(buildID=info['build_id'], arches='src')[0] srpminfo = None
if srpminfo['epoch'] is None: srpms = session.listRPMs(buildID=info['build_id'], arches='src')
srpminfo['epoch'] = "" if srpms:
else: srpminfo = srpms[0]
srpminfo['epoch'] = str(srpminfo['epoch']) + ":" if srpminfo['epoch'] is None:
srpminfo['epoch'] = ""
else:
srpminfo['epoch'] = str(srpminfo['epoch']) + ":"
buildinfo = session.getBuild(info['build_id']) buildinfo = session.getBuild(info['build_id'])
print("RPM: %(epoch)s%(name)s-%(version)s-%(release)s.%(arch)s [%(id)d]" % info) print("RPM: %(epoch)s%(name)s-%(version)s-%(release)s.%(arch)s [%(id)d]" % info)
if info.get('draft'): if info.get('draft'):
@ -3681,9 +3684,16 @@ def anon_handle_rpminfo(goptions, session, args):
print("Build: %(nvr)s [%(id)d]" % buildinfo) print("Build: %(nvr)s [%(id)d]" % buildinfo)
print("RPM Path: %s" % print("RPM Path: %s" %
os.path.join(koji.pathinfo.build(buildinfo), koji.pathinfo.rpm(info))) os.path.join(koji.pathinfo.build(buildinfo), koji.pathinfo.rpm(info)))
print("SRPM: %(epoch)s%(name)s-%(version)s-%(release)s [%(id)d]" % srpminfo) if srpminfo:
print("SRPM Path: %s" % srpm_str = "%(epoch)s%(name)s-%(version)s-%(release)s [%(id)d]" % srpminfo
os.path.join(koji.pathinfo.build(buildinfo), koji.pathinfo.rpm(srpminfo))) srpm_path = os.path.join(
koji.pathinfo.build(buildinfo),
koji.pathinfo.rpm(srpminfo)
)
else:
srpm_path = srpm_str = "(none)"
print("SRPM: %s" % srpm_str)
print("SRPM Path: %s" % srpm_path)
print("Built: %s" % time.strftime('%a, %d %b %Y %H:%M:%S %Z', print("Built: %s" % time.strftime('%a, %d %b %Y %H:%M:%S %Z',
time.localtime(info['buildtime']))) time.localtime(info['buildtime'])))
print("SIGMD5: %(payloadhash)s" % info) print("SIGMD5: %(payloadhash)s" % info)