[Pkg-debile-commits] [debile-web] 01/01: Updated config key names and added compiler display

[Léo Cavaillé]

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

leo.cavaille-guest pushed a commit to branch master
in repository debile-web.

commit 1e51deaf46521765b9d1bd2086f3ce3dd393b75b
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Mon Aug 26 15:17:15 2013 +0200

    Updated config key names and added compiler display
---
 debileweb/blueprints/frontend.py  |    9 ++++-----
 templates/report_desc_binary.html |    6 ++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index 8a59dcc..4685e9a 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -312,12 +312,11 @@ def report(job_id):
     if job.package.type == "source":
         job_info['package_link'] = '/source/%s/%s/%s/%s' % (job.package.user.login, job.package.name, job.package.version, job.package.run)
     else:
-        config = Config()
-        pool = os.path.join(config.get('paths', 'public'), str(job.package.source.package_id),job.package.arch, job.package.deb)
+        pool = os.path.join(config.get('paths', 'pool_url'), str(job.package.source.package_id),job.package.arch, job.package.deb)
         job_info['deb_link'] = pool
         job_info['source_link'] = '/source/%s/%s/%s/%s' % (job.package.source.user.login, job.package.source.name, job.package.source.version, job.package.source.run)
 
-    log_path = os.path.join(config.get('paths', 'job'),
+    log_path = os.path.join(config.get('paths', 'jobs_path'),
                         job_id, 'log.txt')
 
     firehose_link = "/static-job-reports/%s/firehose.xml" % job_id
@@ -344,7 +343,7 @@ def report(job_id):
 @frontend.route("/report/firehose/<job_id>/")
 def report_firehose(job_id):
     config = Config()
-    firehose_path = os.path.join(config.get('paths', 'job'),
+    firehose_path = os.path.join(config.get('paths', 'jobs_path'),
                         job_id, 'firehose.xml')
 
     if os.path.exists(firehose_path):
@@ -353,7 +352,7 @@ def report_firehose(job_id):
 @frontend.route("/report/log/<job_id>/")
 def report_log(job_id):
     config = Config()
-    log_path = os.path.join(config.get('paths', 'job'),
+    log_path = os.path.join(config.get('paths', 'jobs_path'),
                         job_id, 'log')
 
     if os.path.exists(log_path):
diff --git a/templates/report_desc_binary.html b/templates/report_desc_binary.html
index 39ec50b..8fe251c 100644
--- a/templates/report_desc_binary.html
+++ b/templates/report_desc_binary.html
@@ -8,6 +8,12 @@
             <div class='desc_key'>builder</div>
             <div class='desc_value'><a href='{{job_info.machine_link}}'>{{job_info.job.machine.name}}</a></div>
         </div>
+        {% if job_info.job.type == 'build' %}
+        <div class='desc_line'>
+            <div class='desc_key'>compiler setup</div>
+            <div class='desc_value'>{{job_info.job.subtype}}</div>
+        </div>
+        {% endif %}
         <div class='desc_line'>
             <div class='desc_key'>binary package</div>
             <div class='desc_value'>{{job_info.job.package.name}} {{job_info.job.package.version}}</div>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git