The word package is overloaded here and querying koji's comps data by
package was not working before. This patch fixes that.

>From db5d3e4dec740cc5ce5449ddda34a37bef454fa0 Mon Sep 17 00:00:00 2001
From: Mike McLean <[email protected]>
Date: Tue, 16 Dec 2014 11:04:10 -0500
Subject: [PATCH] handle package field for group_package_listing in history
 queries

---
 hub/kojihub.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index 92fc889..f794d5d 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -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
-- 
1.9.3

--
buildsys mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/buildsys

Reply via email to