| |
@@ -696,10 +696,10 @@
|
| |
continuing, trash = [], continuing
|
| |
for nvr, binfo in trash:
|
| |
# determine how long this build has been in the trashcan
|
| |
- mcall.queryHistory(build=binfo['id'], tag=trashcan_tag)['tag_listing']
|
| |
+ mcall.queryHistory(build=binfo['id'], tag=trashcan_tag)
|
| |
|
| |
for (nvr, binfo), [history] in zip(trash, mcall.call_all()):
|
| |
- current = [x for x in history if x['active']]
|
| |
+ current = [x for x in history['tag_listing'] if x['active']]
|
| |
if not current:
|
| |
# untagged just now?
|
| |
print("Warning: history missing for %s" % nvr)
|
| |
@@ -898,7 +898,7 @@
|
| |
continue
|
| |
pkghist = {}
|
| |
for h in history:
|
| |
- if taginfo['maven_include_all'] and h.get('maven_build_id', default=None):
|
| |
+ if taginfo['maven_include_all'] and h.get('maven_build_id'):
|
| |
pkghist.setdefault(h['name'] + '-' + h['version'], []).append(h)
|
| |
else:
|
| |
pkghist.setdefault(h['name'], []).append(h)
|
| |
Fixes: https://pagure.io/koji/issue/2152