From a22298ed1b86106bd1bdfda24d59abeeb0f3357b Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: May 01 2017 18:35:40 +0000
Subject: PR#397 missing argument


Merges #397
https://pagure.io/koji/pull-request/397
Fixes #396
https://pagure.io/koji/issue/396

---

diff --git a/builder/kojid b/builder/kojid
index dd46d4a..bfa2ac3 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -1595,7 +1595,7 @@ class WrapperRPMTask(BaseBuildTask):
 
         if task:
             # called as a subtask of a build
-            artifact_data = self.session.listTaskOutput(task['id'], all_volume=True)
+            artifact_data = self.session.listTaskOutput(task['id'], all_volumes=True)
 
             for artifact_path in artifact_data:
                 artifact_name = os.path.basename(artifact_path)
@@ -4610,7 +4610,7 @@ Build Info: %(weburl)s/buildinfo?buildID=%(build_id)i\r
             result = 'Unknown'
 
         logs, rpms, srpms, misc = [], [], [], []
-        files_data = self.session.listTaskOutput(task_id)
+        files_data = self.session.listTaskOutput(task_id, all_volumes=True)
         for filename in files_data:
             if filename.endswith('.log'):
                 logs += [(filename, volume) for volume in files_data[filename]]
@@ -4623,10 +4623,8 @@ Build Info: %(weburl)s/buildinfo?buildID=%(build_id)i\r
                 misc += [(filename, volume) for volume in files_data[filename]]
 
         # sort by volumes and filenames
-        logs.sort(key=lambda x: x[1])
-        misc.sort(key=lambda x: x[1])
-        logs.sort(key=lambda x: x[0])
-        misc.sort(key=lambda x: x[0])
+        logs.sort(key=lambda x: (x[1], x[0]))
+        misc.sort(key=lambda x: (x[1], x[0]))
         rpms.sort()
 
         data[task_id] = {}
@@ -4720,19 +4718,21 @@ Build Info: %(weburl)s/buildinfo?buildID=%(build_id)i\r
                     else:
                         output += "\r\n"
                     output += "Task Type: %s\r\n" % koji.taskLabel(task)
-                    for filetype in ['logs', 'rpms', 'misc']:
-                        if task[filetype]:
-                            output += "%s:\r\n" % filetype
-                            for (file, volume) in task[filetype]:
-                                if filetype == 'rpms':
-                                    output += " %s\r\n" % '/'.join([buildurl, task['build_arch'], file])
-                                elif filetype == 'logs':
-                                    if tasks[task_state] != 'closed':
-                                        output += " %s/getfile?taskID=%s&name=%s&volume=%s\r\n" % (weburl, task['id'], file, volume)
-                                    else:
-                                        output += " %s\r\n" % '/'.join([buildurl, 'data', 'logs', task['build_arch'], file])
-                                elif task[filetype] == 'misc':
-                                    output += " %s/getfile?taskID=%s&name=%s&volume=%s\r\n" % (weburl, task['id'], file, volume)
+                    if task['logs']:
+                        output += "logs:\r\n"
+                        for (file_, volume) in task['logs']:
+                            if tasks[task_state] != 'closed':
+                                output += " %s/getfile?taskID=%s&name=%s&volume=%s\r\n" % (weburl, task['id'], file_, volume)
+                            else:
+                                output += " %s\r\n" % '/'.join([buildurl, 'data', 'logs', task['build_arch'], file_])
+                    if task['rpms']:
+                        output += "rpms:\r\n"
+                        for file_ in task['rpms']:
+                            output += " %s\r\n" % '/'.join([buildurl, task['build_arch'], file_])
+                    if task['misc']:
+                        output += "misc:\r\n"
+                        for (file_, volume) in task['misc']:
+                            output += " %s/getfile?taskID=%s&name=%s&volume=%s\r\n" % (weburl, task['id'], file_, volume)
                     output += "\r\n"
                 output += "\r\n"