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

CLI list-hosts fix when list of channels is empty

Browse source 
Fixes: https://pagure.io/koji/issue/3532
This commit is contained in:
Jana Cupova 2022-10-06 07:46:07 +02:00 • committed by Tomas Kopecek
parent 2daa71614e
commit 583056140e
2 changed files with 63 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cli/koji_cli/commands.py
View file

@ -3109,8 +3109,7 @@ def anon_handle_list_hosts(goptions, session, args):
opts['ready'] = options.ready
if options.enabled is not None:
opts['enabled'] = options.enabled
tmp_list = sorted([(x['name'], x) for x in session.listHosts(**opts)])
hosts = [x[1] for x in tmp_list]
hosts = sorted(session.listHosts(**opts), key=lambda x: x['name'])
if not hosts:
warn("No hosts found.")
@ -3150,11 +3149,11 @@ def anon_handle_list_hosts(goptions, session, args):
if options.show_channels:
with session.multicall() as m:
result = [m.listChannels(host['id']) for host in hosts]
first_line_channel = result[0].result[0]
for host, channels in zip(hosts, result):
list_channels = []
for c in channels.result:
if 'enabled' in first_line_channel:
# enabled column was added in Koji 1.26
if c.get('enabled') is not None:
if c['enabled']:
list_channels.append(c['name'])
else:
@ -3163,10 +3162,7 @@ def anon_handle_list_hosts(goptions, session, args):
list_channels.append(c['name'])
host['channels'] = ','.join(sorted(list_channels))
if hosts:
longest_host = max([len(h['name']) for h in hosts])
else:
longest_host = 8
longest_host = max([len(h['name']) for h in hosts])
if not options.quiet:
hdr = "{hostname:<{longest_host}} Enb Rdy Load/Cap Arches " \