From 83cf19a6339de389776b0c21753f6a399a5c577f Mon Sep 17 00:00:00 2001 From: Pat Riehecky Date: Feb 10 2020 21:43:07 +0000 Subject: Setup readTaggedBuilds to also return any other tags for a build --- diff --git a/hub/kojihub.py b/hub/kojihub.py index cf54b24..6c010d2 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -1279,7 +1279,7 @@ def readTaggedBuilds(tag, event=None, inherit=False, latest=False, package=None, ('events.id', 'creation_event_id'), ('events.time', 'creation_time'), ('volume.id', 'volume_id'), ('volume.name', 'volume_name'), ('package.id', 'package_id'), ('package.name', 'package_name'), - ('package.name', 'name'), + ('package.name', 'name'), ('tags_list.all_tag_ids', 'all_tag_ids'), ("package.name || '-' || build.version || '-' || build.release", 'nvr'), ('users.id', 'owner_id'), ('users.name', 'owner_name')] st_complete = koji.BUILD_STATES['COMPLETE'] @@ -1315,6 +1315,7 @@ def readTaggedBuilds(tag, event=None, inherit=False, latest=False, package=None, JOIN events ON events.id = build.create_event JOIN package ON package.id = build.pkg_id JOIN volume ON volume.id = build.volume_id + JOIN (select tag_listing.build_id, array_agg(tag_listing.tag_id ORDER BY tag_listing.tag_id) as all_tag_ids from tag_listing group by tag_listing.build_id) as tags_list ON tag_listing.build_id = tags_list.build_id WHERE %s AND tag_id=%%(tagid)s AND build.state=%%(st_complete)i """ % (', '.join([pair[0] for pair in fields]), type_join, eventCondition(event, 'tag_listing'))