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

handle package field for group_package_listing in history queries

Browse source
This commit is contained in:
Mike McLean 2014-12-16 11:04:10 -05:00
parent 8424254d13
commit db5d3e4dec
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hub/kojihub.py
View file

@ -5454,11 +5454,17 @@ def query_history(tables=None, **kwargs):
data['build_id'] = get_build(value, strict=True)['id']
clauses.append("build.id = %(build_id)i")
elif arg == 'package':
if 'package' not in joined:
pkg_field_name = "%s.package" % table
if 'package' in joined:
data['pkg_id'] = get_package_id(value, strict=True)
clauses.append("package.id = %(pkg_id)i")
elif pkg_field_name in fields:
# e.g. group_package_listing
data['group_package'] = str(value)
clauses.append("%s = %%(group_package)s" % pkg_field_name)
else:
skip = True
break
data['pkg_id'] = get_package_id(value, strict=True)
clauses.append("package.id = %(pkg_id)i")
elif arg == 'user':
if 'users' not in joined:
skip = True