summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Bonnet <mikeb@redhat.com>2011-04-05 19:57:20 (GMT)
committerMike Bonnet <mikeb@redhat.com>2011-04-05 19:57:20 (GMT)
commit470bf43be72d26c6d54b43fa706e5032fd7f8b6d (patch)
treeb2aac3c7fce5ef56c650e424ed16776a78e6a285
parent89d6416ac7ebaeea761e89d29e8a086ae306978e (diff)
downloadkoji-470bf43be72d26c6d54b43fa706e5032fd7f8b6d.zip
koji-470bf43be72d26c6d54b43fa706e5032fd7f8b6d.tar.gz
koji-470bf43be72d26c6d54b43fa706e5032fd7f8b6d.tar.xz
download task output directly from KojiFilesURL, rather than going through getfile
-rw-r--r--www/kojiweb/index.py5
-rw-r--r--www/kojiweb/taskinfo.chtml2
2 files changed, 5 insertions, 2 deletions
diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index 342ce3a..1aaf93f 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 cb9fe6c..d65557d 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