[PATCH] fix int encoding in list_rpms

[Mike McLean]

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

diff --git a/hub/kojihub.py b/hub/kojihub.py
index c6e28d7..f076f02 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -3504,12 +3504,18 @@ def list_rpms(buildID=None, buildrootID=None, imageID=None, componentBuildrootID
         else:
             raise koji.GenericError, 'invalid type for "arches" parameter: %s' % type(arches)

-    query = QueryProcessor(columns=[f[0] for f in fields], aliases=[f[1] for f in fields],
+    fields, aliases = zip(*fields)
+    query = QueryProcessor(columns=fields, aliases=aliases,
                            tables=['rpminfo'], joins=joins, clauses=clauses,
                            values=locals(), opts=queryOpts)
     data = query.execute()
-    for row in data:
-        row['size'] = koji.encode_int(row['size'])
+    if not (queryOpts and queryOpts.get('countOnly')):
+        if queryOpts and 'asList' in queryOpts:
+            key = aliases.index('size')
+        else:
+            key = 'size'
+        for row in data:
+            row[key] = koji.encode_int(row[key])
     return data

def get_maven_build(buildInfo, strict=False):

[Dennis Gilmore]

On Tuesday, September 22, 2015 12:49:06 PM Mike McLean wrote:
> hub/kojihub.py | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/hub/kojihub.py b/hub/kojihub.py
> index c6e28d7..f076f02 100644
> --- a/hub/kojihub.py
> +++ b/hub/kojihub.py
> @@ -3504,12 +3504,18 @@ def list_rpms(buildID=None, buildrootID=None,
> imageID=None, componentBuildrootID else:
>              raise koji.GenericError, 'invalid type for "arches" parameter:
> %s' % type(arches)
> query = QueryProcessor(columns=[f[0] for f in fields], aliases=[f[1]
>
> for f in fields], +    fields, aliases = zip(*fields)
> query = QueryProcessor(columns=fields, aliases=aliases,
>                        tables=['rpminfo'], joins=joins,
>
> clauses=clauses, values=locals(), opts=queryOpts)
>      data = query.execute()
> for row in data:
>    row['size'] = koji.encode_int(row['size'])
> if not (queryOpts and queryOpts.get('countOnly')):
>    if queryOpts and 'asList' in queryOpts:
>        key = aliases.index('size')
>    else:
>        key = 'size'
>    for row in data:
>        row[key] = koji.encode_int(row[key])
> return data
>
> def get_maven_build(buildInfo, strict=False):

ACK

Dennis