From 470bf43be72d26c6d54b43fa706e5032fd7f8b6d Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@redhat.com>
Date: Tue, 5 Apr 2011 15:57:20 -0400
Subject: [PATCH] download task output directly from KojiFilesURL, rather than
 going through getfile

---
 www/kojiweb/index.py       | 5 ++++-
 www/kojiweb/taskinfo.chtml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index 342ce3a2..1aaf93fc 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -605,7 +605,10 @@ def taskinfo(req, taskID):
         values['perms'] = server.getUserPerms(req.currentUser['id'])
     else:
         values['perms'] = []
-    
+
+    topurl = req.get_options().get('KojiFilesURL', 'http://localhost/')
+    values['pathinfo'] = koji.PathInfo(topdir=topurl)
+
     return _genHTML(req, 'taskinfo.chtml')
 
 def imageinfo(req, imageID):
diff --git a/www/kojiweb/taskinfo.chtml b/www/kojiweb/taskinfo.chtml
index cb9fe6c8..d65557d6 100644
--- a/www/kojiweb/taskinfo.chtml
+++ b/www/kojiweb/taskinfo.chtml
@@ -366,7 +366,7 @@ ${excClass.__name__}: $cgi.escape($str($result))
       <th>Output</th>
       <td>
         #for $filename in $output
-        <a href="getfile?taskID=$task.id&name=$urllib.quote($filename)">$filename</a>
+        <a href="$pathinfo.task($task.id)/$urllib.quote($filename)">$filename</a>
            #if $filename.endswith('.log')
            (<a href="getfile?taskID=$task.id&name=$urllib.quote($filename)&offset=-4000">tail</a>)
            #end if