From ec3ef399a8b126f22840b09dcd126ffa3bf46e21 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Feb 08 2021 12:58:47 +0000
Subject: PR#2683: web: display VCS/DistURL rpm tags


Merges #2683
https://pagure.io/koji/pull-request/2683

Fixes: #2541
https://pagure.io/koji/issue/2541
Exposing RPM's VCS tag

---

diff --git a/www/kojiweb/buildinfo.chtml b/www/kojiweb/buildinfo.chtml
index 2a70487..dd4aa35 100644
--- a/www/kojiweb/buildinfo.chtml
+++ b/www/kojiweb/buildinfo.chtml
@@ -50,6 +50,16 @@
       <th>Description</th><td class="rpmheader">$util.escapeHTML($description)</td>
     </tr>
     #end if
+    #if $vcs
+    <tr>
+        <th><label title="Package source code VCS location">VCS</label></th><td>$vcs</td>
+    </tr>
+    #end if
+    #if $disturl
+    <tr>
+        <th>DistURL</th><td>$disturl</td>
+    </tr>
+    #end if
     <tr>
       <th>Built by</th><td class="user-$build.owner_name"><a href="userinfo?userID=$build.owner_id">$build.owner_name</a></td>
     </tr>
diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index c838335..de56d55 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -1240,9 +1240,10 @@ def buildinfo(environ, buildID):
 
     if 'src' in rpmsByArch:
         srpm = rpmsByArch['src'][0]
-        headers = server.getRPMHeaders(srpm['id'], headers=['summary', 'description'])
-        values['summary'] = koji.fixEncoding(headers.get('summary'))
-        values['description'] = koji.fixEncoding(headers.get('description'))
+        headers = ('summary', 'description', 'disturl', 'vcs')
+        result = server.getRPMHeaders(rpm['id'], headers=headers)
+        for header in headers:
+            values[header] = koji.fixEncoding(result.get(header))
         values['changelog'] = server.getChangelogEntries(build['id'])
 
     if build['task_id']:
@@ -1496,10 +1497,10 @@ def rpminfo(environ, rpmID, fileOrder='name', fileStart=None, buildrootOrder='-i
         for dep_type in dep_names:
             values[dep_names[dep_type]] = [d for d in deps if d['type'] == dep_type]
             values[dep_names[dep_type]].sort(key=_sortbyname)
-        headers = server.getRPMHeaders(rpm['id'], headers=['summary', 'description', 'license'])
-        values['summary'] = koji.fixEncoding(headers.get('summary'))
-        values['description'] = koji.fixEncoding(headers.get('description'))
-        values['license'] = koji.fixEncoding(headers.get('license'))
+        headers = ('summary', 'description', 'license', 'disturl', 'vcs')
+        result = server.getRPMHeaders(rpm['id'], headers=headers)
+        for header in headers:
+            values[header] = koji.fixEncoding(result.get(header))
     buildroots = kojiweb.util.paginateMethod(server, values, 'listBuildroots',
                                              kw={'rpmID': rpm['id']},
                                              start=buildrootStart,
diff --git a/www/kojiweb/rpminfo.chtml b/www/kojiweb/rpminfo.chtml
index 4253b2e..d2794e1 100644
--- a/www/kojiweb/rpminfo.chtml
+++ b/www/kojiweb/rpminfo.chtml
@@ -68,6 +68,16 @@
     <tr>
       <th>License</th><td>$util.escapeHTML($license)</td>
     </tr>
+    #if $vcs
+    <tr>
+        <th><label title="Package source code VCS location">VCS</label></th><td>$vcs</td>
+    </tr>
+    #end if
+    #if $disturl
+    <tr>
+        <th>DistURL</th><td>$disturl</td>
+    </tr>
+    #end if
     #end if
     #if $builtInRoot
     <tr>