From 1bc1fab5a6dffea7e7f190a03f3360f14559f6f1 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Feb 07 2019 09:23:25 +0000
Subject: fix weak deps handling in rpminfo web page


PR #965 (commit ef998c6) changed way, how weak reference support is
detected in rpm. As a result, web page rpminfo is failing due to missing
variable.

Fixes: https://pagure.io/koji/issue/1234

---

diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index 39c6188..3da61b2 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -1372,18 +1372,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)
-        if koji.RPM_SUPPORTS_OPTIONAL_DEPS:
-            values['optional_deps'] = True
+        if koji.SUPPORTED_OPT_DEP_HDRS['RECOMMENDNAME']:
             values['recommends'] = server.getRPMDeps(rpm['id'], koji.DEP_RECOMMEND)
             values['recommends'].sort(_sortbyname)
+        if koji.SUPPORTED_OPT_DEP_HDRS['SUGGESTNAME']:
             values['suggests'] = server.getRPMDeps(rpm['id'], koji.DEP_SUGGEST)
             values['suggests'].sort(_sortbyname)
+        if koji.SUPPORTED_OPT_DEP_HDRS['SUPPLEMENTNAME']:
             values['supplements'] = server.getRPMDeps(rpm['id'], koji.DEP_SUPPLEMENT)
             values['supplements'].sort(_sortbyname)
+        if koji.SUPPORTED_OPT_DEP_HDRS['ENHANCENAME']:
             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', 'license'])
         values['summary'] = koji.fixEncoding(headers.get('summary'))
         values['description'] = koji.fixEncoding(headers.get('description'))
diff --git a/www/kojiweb/rpminfo.chtml b/www/kojiweb/rpminfo.chtml
index d217c94..0f8816e 100644
--- a/www/kojiweb/rpminfo.chtml
+++ b/www/kojiweb/rpminfo.chtml
@@ -144,7 +144,7 @@
         #end if
       </td>
     </tr>
-    #if $optional_deps
+    #if $koji.SUPPORTED_OPT_DEP_HDRS['RECOMMENDNAME']
     <tr>
       <th>Recommends</th>
       <td class="container">
@@ -161,6 +161,8 @@
         #end if
       </td>
     </tr>
+    #end if
+    #if $koji.SUPPORTED_OPT_DEP_HDRS['SUGGESTNAME']
     <tr>
       <th>Suggests</th>
       <td class="container">
@@ -177,6 +179,8 @@
         #end if
       </td>
     </tr>
+    #end if
+    #if $koji.SUPPORTED_OPT_DEP_HDRS['SUPPLEMENTNAME']
     <tr>
       <th>Supplements</th>
       <td class="container">
@@ -193,6 +197,8 @@
         #end if
       </td>
     </tr>
+    #end if
+    #if $koji.SUPPORTED_OPT_DEP_HDRS['ENHANCENAME']
     <tr>
       <th>Enhances</th>
       <td class="container">