handle an empty relpath correctly

koji/__init__.py

@@ -1390,6 +1390,14 @@ class PathInfo(object):
         """Return the directory where the Windows build exists"""
         return self.build(build) + '/win'
 
+    def winfile(self, wininfo):
+        """Return the relative path from the winbuild directory where the
+           file identified by wininfo is located."""
+        filepath = wininfo['filename']
+        if wininfo.get('relpath'):
+            filepath = wininfo['relpath'] + '/' + filepath
+        return filepath
+
     def mavenrepo(self, build, maveninfo):
         """Return the directory where the Maven artifact exists in the per-tag Maven repo
         (/mnt/koji/repos/tag-name/repo-id/maven2/)"""

www/kojiweb/archiveinfo.chtml

@@ -13,7 +13,7 @@
     </tr>
     <tr>
     #if $wininfo
-      <th>File Name</th><td>$wininfo.relpath/$archive.filename</td>
+      <th>File Name</th><td>$koji.pathinfo.winfile($archive)</td>
     #else
       <th>File Name</th><td>$archive.filename</td>
     #end if

www/kojiweb/buildinfo.chtml

@@ -174,7 +174,7 @@
             #if $mavenbuild
             $archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$archiveurl/$archive.filename">download</a>)
             #elif $winbuild
-            $archive.relpath/$archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$downloadBase/$nvrpath/win/$archive.relpath/$archive.filename">download</a>)
+            $koji.pathinfo.winfile($archive) (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$downloadBase/$nvrpath/win/$koji.pathinfo.winfile($archive)">download</a>)
             #end if
 	    </td>
 	  </tr>