[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: include bug stati into live_status

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 8758d820d6ee4b668f70210ec594b90ba58ab075
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Sep 11 15:49:34 2015 +0200

    reproducible: include bug stati into live_status
---
 bin/reproducible_html_indexes.py     | 4 ++--
 bin/reproducible_html_live_status.py | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_html_indexes.py b/bin/reproducible_html_indexes.py
index d5a8aeb..d73a887 100755
--- a/bin/reproducible_html_indexes.py
+++ b/bin/reproducible_html_indexes.py
@@ -531,11 +531,11 @@ def build_page(page, suite=None, arch=None):
         destfile = BASE + '/' + suite + '/' + arch + '/index_' + page + '.html'
         desturl = REPRODUCIBLE_URL + '/' + suite + '/' + arch + '/index_' + \
                   page + '.html'
-    write_html_page(title=title, body=html, destfile=destfile, suite=suite, arch=arch, style_note=footnote)
+    write_html_page(title=title, body=html, destfile=destfile, suite=suite, arch=arch, style_note=True)
     log.info('"' + title + '" now available at ' + desturl)
 
 
-bugs = get_bugs()
+bugs = get_bugs() # FIXME: this variable should not be global, else merely importing _html_indexes always queries UDD
 
 if __name__ == '__main__':
     for arch in ARCHS:
diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index 96d6eb2..efb3c13 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -24,7 +24,7 @@ def convert_into_hms_string(duration):
         elif minutes > 0:
             duration = str(minutes)+'m ' + str(seconds) + 's'
         else:
-            duration = str(seconds+"s")
+            duration = str(seconds)+'s'
     return duration
 
 def generate_schedule(arch):
@@ -42,17 +42,18 @@ def generate_schedule(arch):
     html += '<p><table class="scheduled">\n' + tab
     html += '<tr><th>#</th><th>scheduled at</th><th>suite</th>'
     html += '<th>arch</th><th>source package</th></tr>\n'
+    bugs = get_bugs()
     for row in rows:
         # 0: date_scheduled, 1: suite, 2: arch, 3: pkg name
         pkg = row[3]
         html += tab + '<tr><td> </td><td>' + row[0] + '</td>'
         html += '<td>' + row[1] + '</td><td>' + row[2] + '</td><td><code>'
-        html += link_package(pkg, row[1], row[2])
+        html += link_package(pkg, row[1], row[2], bugs)
         html += '</code></td></tr>\n'
     html += '</table></p>\n'
     destfile = BASE + '/index_' + arch + '_scheduled.html'
     desturl = REPRODUCIBLE_URL + '/index_' + arch + '_scheduled.html'
-    write_html_page(title=title, body=html, destfile=destfile, arch=arch, refresh_every=60)
+    write_html_page(title=title, body=html, destfile=destfile, arch=arch, style_note=True, refresh_every=60)
     log.info("Page generated at " + desturl)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git