From 808a8eb28c202adf55b7b9c1faa15dd5b8b1613b Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Sun, 30 Aug 2015 14:07:14 +0200
Subject: reproducible: refactor

---
 bin/reproducible_common.py        |  8 ++------
 bin/reproducible_html_packages.py | 10 +++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index b4d56223..31ad7338 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -674,12 +674,8 @@ class Build:
                 return          # suite/arch, or none at all
         self.status = str(result[0])
         self.version = str(result[1])
-        # this is currently used only on rb-pkg pages, no need to have
-        if result[2]:                       # parsable timestamps and the like
-            self.build_date = 'at ' + str(result[2]) + ' UTC'
-        else:
-            self.build_date = \
-                '<span style="color:red;font-weight:bold;">UNTESTED</span>'
+        if result[2]:
+            self.build_date = str(result[2]) + ' UTC'
 
 
 class Package:
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index dd865534..60bf0a31 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -181,6 +181,10 @@ def gen_suites_links(package, current_suite, current_arch):
                 continue
             version = package.get_tested_version(s, a)
             build_date = package.get_build_date(s, a)
+            if build_date:
+                build_date = ' on ' + build_date
+            else:
+                build_date = ''
             li_classes = ['suite']
             if s == current_suite and a == current_arch:
                 li_classes.append('active')
@@ -194,7 +198,7 @@ def gen_suites_links(package, current_suite, current_arch):
             icon = prefix + '<img src="/static/{icon}" alt="{status}" title="{status}"/>' + suffix
             html += icon.format(icon=join_status_icon(status)[1], status=status)
             html += (tab*2 + ' <a href="{}/{}/{}/{}.html" target="_parent"' + \
-                     ' title="{}: {} on {}">{}</a>: {}\n').format(RB_PKG_URI,
+                     ' title="{}: {}{}">{}</a>: {}\n').format(RB_PKG_URI,
                      s, a, package.name, status, version, build_date, s, version)
             html += '</li>\n'
         html += tab + '</ul></li>'
@@ -217,6 +221,10 @@ def gen_packages_html(packages, no_clean=False):
                 status = package.get_status(suite, arch)
                 version = package.get_tested_version(suite, arch)
                 build_date = package.get_build_date(suite, arch)
+                if build_date:
+                    build_date = 'at ' + build_date
+                else:
+                    build_date = '<span style="color:red;font-weight:bold;">UNTESTED</span>'
                 if status == False:  # the package is not in the checked suite
                     continue
                 log.debug('Generating the page of %s/%s/%s @ %s built at %s',
-- 
cgit v1.2.3-70-g09d2