[Qa-jenkins-scm] [jenkins.debian.net] 04/05: reproducible: common.py: fix a 'debian' hardcoding

[Mattia Rizzolo]

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

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

commit 027f3e2342025e94b97ed0a313eaec6930a56134
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Nov 22 16:15:22 2017 +0100

    reproducible: common.py: fix a 'debian' hardcoding
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/reproducible_common.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 9933be6..00f91e9 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -102,7 +102,7 @@ REPRODUCIBLE_TRACKER_JSON = os.path.join(BASE, conf_distro['tracker.json_out'])
 REPRODUCIBLE_STYLES = os.path.join(BASE, conf_distro['css'])
 
 DEBIAN_URI = '/' + conf_distro['distro_root']
-DEBIAN_BASE = BASE + '/' + DEBIAN_URI
+DEBIAN_BASE = os.path.join(BASE, conf_distro['distro_root'])
 DBD_URI = os.path.join(DEBIAN_URI, conf_distro['diffoscope_html'])
 DBDTXT_URI = os.path.join(DEBIAN_URI, conf_distro['diffoscope_txt'])
 LOGS_URI = os.path.join(DEBIAN_URI, conf_distro['buildlogs'])
@@ -152,6 +152,7 @@ for key, value in conf_distro.items():
     log.debug('%-16s: %s', key, value)
 log.debug("BIN_PATH:\t" + BIN_PATH)
 log.debug("BASE:\t\t" + BASE)
+log.debug("DISTRO:\t\t" + DISTRO)
 log.debug("DBD_URI:\t\t" + DBD_URI)
 log.debug("DBD_PATH:\t" + DBD_PATH)
 log.debug("DBDTXT_URI:\t" + DBDTXT_URI)
@@ -295,7 +296,7 @@ def gen_suite_arch_nav_context(suite, arch, suite_arch_nav_template=None,
                                no_arch=None):
     # if a template is not passed in to navigate between suite and archs the
     # current page, we use the "default" suite/arch summary view.
-    default_nav_template = '/debian/{{suite}}/index_suite_{{arch}}_stats.html'
+    default_nav_template = '/{{distro}}/{{suite}}/index_suite_{{arch}}_stats.html'
     if not suite_arch_nav_template:
         suite_arch_nav_template = default_nav_template
 
@@ -309,7 +310,8 @@ def gen_suite_arch_nav_context(suite, arch, suite_arch_nav_template=None,
                 's': s,
                 'class': 'current' if s == suite else '',
                 'uri': renderer.render(suite_arch_nav_template,
-                                       {'suite': s, 'arch': arch})
+                                       {'distro': conf_distro['distro_root'],
+                                        'suite': s, 'arch': arch})
                 if include_suite else '',
             })
 
@@ -320,7 +322,8 @@ def gen_suite_arch_nav_context(suite, arch, suite_arch_nav_template=None,
                 'a': a,
                 'class': 'current' if a == arch else '',
                 'uri': renderer.render(suite_arch_nav_template,
-                                       {'suite': suite, 'arch': a}),
+                                       {'distro': conf_distro['distro_root'],
+                                        'suite': suite, 'arch': a}),
             })
     return (suite_list, arch_list)
 

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