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

PR#4086: Drop part of code related to host without update_ts

Browse source 
Merges #4086
https://pagure.io/koji/pull-request/4086

Fixes: #4085
https://pagure.io/koji/issue/4085
Remove part of code in index.py which is for older hub related to update_ts for host
This commit is contained in:
Tomas Kopecek 2024-05-06 11:23:35 +02:00
commit a9526e8403
1 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
www/kojiweb/index.py
View file

@ -1731,17 +1731,8 @@ def hosts(environ, state='enabled', start=None, order='name', ready='all', chann
values['channels'] = sorted(server.listChannels(), key=lambda x: x['name'])
if hosts and 'update_ts' not in hosts[0]:
# be nice with older hub
# TODO remove this compat workaround after a release
with server.multicall() as m:
updates = [m.getLastHostUpdate(host['id'], ts=True) for host in hosts]
for host, lastUpdate in zip(hosts, updates):
host['last_update'] = lastUpdate.result
else:
for host in hosts:
host['last_update'] = koji.formatTimeLong(host['update_ts'])
for host in hosts:
host['last_update'] = koji.formatTimeLong(host['update_ts'])
# Paginate after retrieving last update info so we can sort on it
kojiweb.util.paginateList(values, hosts, start, 'hosts', 'host', order)
@ -1786,12 +1777,7 @@ def hostinfo(environ, hostID=None, userID=None):
values['host'] = host
values['channels'] = channels
values['buildroots'] = buildroots
if 'update_ts' not in host:
# be nice with older hub
# TODO remove this compat workaround after a release
values['lastUpdate'] = server.getLastHostUpdate(host['id'], ts=True)
else:
values['lastUpdate'] = koji.formatTimeLong(host['update_ts'])
values['lastUpdate'] = koji.formatTimeLong(host['update_ts'])
if environ['koji.currentUser']:
values['perms'] = server.getUserPerms(environ['koji.currentUser']['id'])
else: