particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix kojiweb regressions after merge

Browse source
This commit is contained in:
Jay Greguske 2011-05-16 10:21:31 -04:00 • committed by Mike McLean
parent 80e5abc273
commit 7666033147
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
www/kojiweb/buildinfo.chtml
View file

@ -160,7 +160,7 @@
#elif $winbuild
(<a href="$nvrpath/data/logs/win/">build logs</a>)
#elif $imagebuild
(<a href="$imageBase/$nvrpath/data/logs/image">build logs</a>)
(<a href="$imageBase/data/logs/image">build logs</a>)
#end if
#end if
</td>
@ -174,7 +174,7 @@
#elif $winbuild
$pathinfo.winfile($archive) (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$pathinfo.winbuild($build)/$pathinfo.winfile($archive)">download</a>)
#elif $imagebuild
$archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$imageBase/$nvrpath/$archive.filename">download</a>)
$archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$imageBase/$archive.filename">download</a>)
#end if
</td>
</tr>

5
www/kojiweb/index.py
View file

@ -1188,10 +1188,11 @@ def buildinfo(environ, buildID):
values['pathinfo'] = koji.PathInfo(topdir=topurl)
if imagebuild:
image_url = topurl + '/images' # XXX
nvrpath = os.path.join(build['name'], build['version'], build['release'])
if 'iso' in archivesByExt.keys():
values['imageBase'] = image_url + '/livecd'
values['imageBase'] = image_url + '/livecd/' + nvrpath
else:
values['imageBase'] = image_url + '/appliance'
values['imageBase'] = image_url + '/appliance/' + nvrpath
return _genHTML(environ, 'buildinfo.chtml')
def builds(environ, userID=None, tagID=None, packageID=None, state=None, order='-build_id', start=None, prefix=None, inherited='1', latest='1', type=None):