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

Fix list-hosts and hostinfo for older hub

Browse source 
Fixes: https://pagure.io/koji/issue/2497
This commit is contained in:
Jana Cupova 2021-04-01 10:05:59 +02:00
parent f3349d696f
commit 42546751be
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cli/koji_cli/commands.py
View file

@ -2888,7 +2888,11 @@ def anon_handle_list_hosts(goptions, session, args):
# pull in the last update using multicall to speed it up a bit
session.multicall = True
for host in hosts:
session.getLastHostUpdate(host['id'], ts=True)
try:
session.getLastHostUpdate(host['id'], ts=True)
except koji.ParameterError:
# Hubs prior to v1.25.0 do not have a "ts" parameter for getLastHostUpdate
session.getLastHostUpdate(host['id'])
updateList = session.multiCall()
for host, [update] in zip(hosts, updateList):
@ -3359,7 +3363,11 @@ def anon_handle_hostinfo(goptions, session, args):
print("Comment:")
print("Enabled: %s" % (info['enabled'] and 'yes' or 'no'))
print("Ready: %s" % (info['ready'] and 'yes' or 'no'))
update = session.getLastHostUpdate(info['id'], ts=True)
try:
update = session.getLastHostUpdate(info['id'], ts=True)
except koji.ParameterError:
# Hubs prior to v1.25.0 do not have a "ts" parameter for getLastHostUpdate
update = session.getLastHostUpdate(info['id'])
if update is None:
update = "never"
else: