---
www/kojiweb/buildinfo.chtml | 2 +-
www/kojiweb/index.py | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/www/kojiweb/buildinfo.chtml b/www/kojiweb/buildinfo.chtml
index 07c62fd..77cb249 100644
--- a/www/kojiweb/buildinfo.chtml
+++ b/www/kojiweb/buildinfo.chtml
@@ -127,7 +127,7 @@
#end if
</td>
</tr>
- #for $rpm in $rpmsByArch[$arch] + $debuginfoByArch.get($arch, [])
+ #for $rpm in $rpmsByArch[$arch]
<tr>
#set $rpmfile =
'%(name)s-%(version)s-%(release)s.%(arch)s.rpm' % $rpm
#set $rpmpath = $pathinfo.rpm($rpm)
diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index 4be6131..fdbbc27 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -1102,12 +1102,15 @@ def buildinfo(environ, buildID):
archivesByExt.setdefault(os.path.splitext(archive['filename'])[1][1:],
[]).append(archive)
rpmsByArch = {}
- debuginfoByArch = {}
+ debuginfos = []
for rpm in rpms:
if koji.is_debuginfo(rpm['name']):
- debuginfoByArch.setdefault(rpm['arch'], []).append(rpm)
+ debuginfos.append(rpm)
else:
rpmsByArch.setdefault(rpm['arch'], []).append(rpm)
+ # add debuginfos at the end
+ for rpm in debuginfos:
+ rpmsByArch.setdefault(rpm['arch'], []).append(rpm)
if rpmsByArch.has_key('src'):
srpm = rpmsByArch['src'][0]
@@ -1163,7 +1166,6 @@ def buildinfo(environ, buildID):
values['build'] = build
values['tags'] = tags
values['rpmsByArch'] = rpmsByArch
- values['debuginfoByArch'] = debuginfoByArch
values['task'] = task
values['mavenbuild'] = mavenbuild
values['winbuild'] = winbuild
--
2.1.0
Show replies by date