[Qa-jenkins-scm] [jenkins.debian.net] 05/08: reproducible debian: add package list symbol legend template

Tue Jul 5 15:25:11 UTC 2016

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 4cd9250228ad1d17f6ce01a517e8897902c96bb4
Author: Valerie R Young <spectranaut at riseup.net>
Date:   Sat Jun 25 08:42:11 2016 -0400

    reproducible debian: add package list symbol legend template
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_common.py               | 17 +++--------------
 bin/reproducible_common.sh               |  3 ++-
 bin/templates/pkg_symbol_legend.mustache | 13 +++++++++++++
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index c3ea23f..d207777 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -145,6 +145,8 @@ status_icon_link_template = renderer.load_template(
     TEMPLATE_PATH + '/status_icon_link')
 default_page_footer_template = renderer.load_template(
     TEMPLATE_PATH + '/default_page_footer')
+pkg_legend_template = renderer.load_template(
+    TEMPLATE_PATH + '/pkg_symbol_legend')
 
 
 html_header = Template("""<!DOCTYPE html>
@@ -237,19 +239,6 @@ html_head_page = Template((tab*2).join(("""
 $project_links
 </header><div class="mainbody">""" % DEBIAN_URL ).splitlines(True)))
 
-html_foot_page_style_note = Template((tab*2).join("""
-<p style="font-size:0.9em;">
-  A package name displayed with a <span style="font-weight: bold;">bold font</span> is an indication that this
-  package has a note. Visited packages are linked in green, those which
-  have not been visited are linked in blue.<br />
-  A <code><span class="bug">#</span></code> sign after the name of a
-  package indicates that a bug is filed against it. Likewise, a
-  <code><span class="bug-patch">+</span></code> sign indicates there is
-  a patch available, a <code><span class="bug-pending">P</span></code> means a
-  pending bug while <code><span class="bug-done">#</span></code>
-  indicates a closed bug. In cases of several bugs, the symbol is repeated.
-</p>""".splitlines(True)))
-
 html_project_links = Template((tab*2).join("""
     <ul class="reproducible-links">
         <li>Reproducible Builds projects links
@@ -381,7 +370,7 @@ def write_html_page(title, body, destfile, suite=defaultsuite, arch=defaultarch,
             project_links=project_links)
     html += body
     if style_note:
-        html += html_foot_page_style_note.substitute()
+        html += renderer.render(pkg_legend_template, {})
     if not noendpage:
         html += create_default_page_footer(now)
         html += '</body>\n</html>'
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 9a6b865..651299b 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -367,7 +367,7 @@ write_page_intro() {
 	fi
 }
 
-# See the python equivelent of this function: reproducible_common.py's create_default_page_footer
+# See the python equivalent of this function: reproducible_common.py's create_default_page_footer
 write_page_footer() {
 	write_page "<hr id=\"footer_separator\" /><p style=\"font-size:0.9em;\"><div id=\"page_footer\">"
 	if [ -n "$JOB_URL" ] ; then
@@ -395,6 +395,7 @@ write_page_footer() {
 	write_page "</body></html>"
 }
 
+# A mustache equivalent of this function has been created. See TEMPLATE_PATH/pkg_list_key.mustache
 write_page_meta_sign() {
 	write_page "<p style=\"font-size:0.9em;\">A package name displayed with a <span style=\"font-weight: bold;\">bold font</span> is an indication that this package has a note. Visited packages are linked in green, those which have not been visited are linked in blue.</br>"
 	write_page "A <code><span class=\"bug\">#</span></code> sign after the name of a package indicates that a bug is filed against it. Likewise, a <code><span class=\"bug-patch\">+</span></code> sign indicates there is a patch available, a <code><span class="bug-pending">P</span></code> means a pending bug while <code><span class=\"bug-done\">#</span></code> indicates a closed bug. In cases of several bugs, the symbol is repeated.</p>"
diff --git a/bin/templates/pkg_symbol_legend.mustache b/bin/templates/pkg_symbol_legend.mustache
new file mode 100644
index 0000000..12fe485
--- /dev/null
+++ b/bin/templates/pkg_symbol_legend.mustache
@@ -0,0 +1,13 @@
+<p style="font-size:0.9em;">
+A package name displayed with a <span style="font-weight: bold;">bold
+font</span> is an indication that this package has a note. Visited
+packages are linked in green, those which have not been visited are
+linked in blue.
+<br />
+A <code><span class="bug">#</span></code> sign after the name of a package
+indicates that a bug is filed against it. Likewise, a
+<code><span class="bug-patch">+</span></code> sign indicates there is a
+patch available, a <code><span class="bug-pending">P</span></code> means a
+pending bug while <code><span class="bug-done">#</span></code> indicates a
+closed bug. In cases of several bugs, the symbol is repeated.
+</p>

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

