- remove KojiArchiveURL

- fix the Maven archive links on the buildinfo page
This commit is contained in:
Mike Bonnet 2009-11-04 15:56:21 -05:00
parent 56cfb0187a
commit 9ae9c16682
3 changed files with 6 additions and 7 deletions

View file

@ -13,7 +13,6 @@ Alias /koji "/usr/share/koji-web/scripts/"
PythonOption KojiHubURL http://hub.example.com/kojihub
PythonOption KojiPackagesURL http://server.example.com/mnt/koji/packages
PythonOption KojiMavenURL http://server.example.com/mnt/koji/maven2
PythonOption KojiArchiveURL http://server.example.com/mnt/koji/archives
PythonOption KojiImagesURL http://server.example.com/mnt/koji/images
PythonOption WebPrincipal koji/web@EXAMPLE.COM
PythonOption WebKeytab /etc/httpd.keytab

View file

@ -4,6 +4,12 @@
#include "includes/header.chtml"
#set $nvrpath = '%(name)s/%(version)s/%(release)s' % $build
#set $archiveurl = ''
#if $mavenbuild
#set $archiveurl = '%s/%s/%s/%s/%s' % ($mavenBase, $mavenbuild['group_id'].replace('.', '/'),
$mavenbuild['artifact_id'], $mavenbuild['version'],
$build['release'])
#end if
<h4>Information for build <a href="buildinfo?buildID=$build.id">$koji.buildLabel($build)</a></h4>
@ -160,11 +166,6 @@
#for $archive in $archivesByExt[$ext]
<tr>
<td/>
#if $mavenbuild
#set $archiveurl = '%s/%s/%s/%s' % ($mavenBase, $mavenbuild.group_id.replace('.', '/'), $mavenbuild.artifact_id, $mavenbuild.version)
#else
#set $archiveurl = '%s/%s/%s/%s' % ($archiveBase, $build.name, $build.version, $build.release)
#end if
<td>
$archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$archiveurl/$archive.filename">download</a>)
</td>

View file

@ -1078,7 +1078,6 @@ def buildinfo(req, buildID):
values['downloadBase'] = req.get_options().get('KojiPackagesURL', 'http://localhost/packages')
values['mavenBase'] = req.get_options().get('KojiMavenURL', 'http://localhost/maven2')
values['archiveBase'] = req.get_options().get('KojiArchiveURL', 'http://localhost/archives')
return _genHTML(req, 'buildinfo.chtml')