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

don't show optional deps if they are not supported by rpm

Browse source
This commit is contained in:
Tomas Kopecek 2016-10-06 14:12:45 +02:00 • committed by Mike McLean
parent 78d34d7b9d
commit 82ea17e808
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
www/kojiweb/index.py
View file

@ -1369,14 +1369,18 @@ def rpminfo(environ, rpmID, fileOrder='name', fileStart=None, buildrootOrder='-i
values['conflicts'].sort(_sortbyname)
values['requires'] = server.getRPMDeps(rpm['id'], koji.DEP_REQUIRE)
values['requires'].sort(_sortbyname)
values['recommends'] = server.getRPMDeps(rpm['id'], koji.DEP_RECOMMEND)
values['recommends'].sort(_sortbyname)
values['suggests'] = server.getRPMDeps(rpm['id'], koji.DEP_SUGGEST)
values['suggests'].sort(_sortbyname)
values['supplements'] = server.getRPMDeps(rpm['id'], koji.DEP_SUPPLEMENT)
values['supplements'].sort(_sortbyname)
values['enhances'] = server.getRPMDeps(rpm['id'], koji.DEP_ENHANCE)
values['enhances'].sort(_sortbyname)
if koji.RPM_SUPPORTS_OPTIONAL_DEPS:
values['optional_deps'] = True
values['recommends'] = server.getRPMDeps(rpm['id'], koji.DEP_RECOMMEND)
values['recommends'].sort(_sortbyname)
values['suggests'] = server.getRPMDeps(rpm['id'], koji.DEP_SUGGEST)
values['suggests'].sort(_sortbyname)
values['supplements'] = server.getRPMDeps(rpm['id'], koji.DEP_SUPPLEMENT)
values['supplements'].sort(_sortbyname)
values['enhances'] = server.getRPMDeps(rpm['id'], koji.DEP_ENHANCE)
values['enhances'].sort(_sortbyname)
else:
values['optional_deps'] = False
headers = server.getRPMHeaders(rpm['id'], headers=['summary', 'description'])
values['summary'] = koji.fixEncoding(headers.get('summary'))
values['description'] = koji.fixEncoding(headers.get('description'))

2
www/kojiweb/rpminfo.chtml
View file

@ -139,6 +139,7 @@
#end if
</td>
</tr>
#if $optional_deps
<tr>
<th>Recommends</th>
<td class="container">
@ -203,6 +204,7 @@
#end if
</td>
</tr>
#end if
<tr>
<th id="filelist">Files</th>
<td class="container">