[Pkg-debile-commits] [debile-slave] 03/28: Fixes the copy of scan-build logs

[Sylvestre Ledru]

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

sylvestre pushed a commit to branch master
in repository debile-slave.

commit 4e916fd036e71933643282d48b91a60218ae4f36
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Tue Aug 6 16:16:54 2013 +0200

    Fixes the copy of scan-build logs
---
 ethel/daemon.py                |   23 +++++++++++------------
 ethel/runners/clanganalyzer.py |    3 ++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ethel/daemon.py b/ethel/daemon.py
index b94bbc6..b5f3537 100644
--- a/ethel/daemon.py
+++ b/ethel/daemon.py
@@ -95,7 +95,7 @@ def iterate():
         with tdir() as fd:
             with cd(fd):
                 with checkout(package) as target:
-                    firehose, log, err = handler(target, package,
+                    firehose, log, ERRHACK = handler(target, package,
                                                  job, firehose)
 
                     logging.info("Job worker returned, filing reports")
@@ -112,19 +112,18 @@ def iterate():
                     if job['type'] == 'clanganalyzer':
                         logging.info("SCANDALOUS HACK sending scan-build HTML reports")
                         remote_path = proxy.get_scanbuildhtml_write_location(job['uuid'])
-                        cmd = config.get('lucy', 'copy').format(src=out[0],
+                        cmd = config.get('lucy', 'copy').format(src=ERRHACK,
                                                     dest=remote_path)
                         out, err, ret = run_command(cmd)
-                    if job['type'] != 'clanganalyzer':
-                        logging.info("Sending the logs to the pool")
-                        remote_path = proxy.get_log_write_location(job['uuid'])
-                        open('ethel-log', 'wb').write(log.encode('utf-8'))
-                        cmd = config.get('lucy', 'copy').format(src='ethel-log',
-                                                    dest=remote_path)
-                        out, err, ret = run_command(cmd)
-                        if ret != 0:
-                            print(out)
-                            raise Exception("SHIT.")
+                    logging.info("Sending the logs to the pool")
+                    remote_path = proxy.get_log_write_location(job['uuid'])
+                    open('ethel-log', 'wb').write(log.encode('utf-8'))
+                    cmd = config.get('lucy', 'copy').format(src='ethel-log',
+                                                dest=remote_path)
+                    out, err, ret = run_command(cmd)
+                    if ret != 0:
+                        print(out)
+                        raise Exception("SHIT.")
 
 
 def main():
diff --git a/ethel/runners/clanganalyzer.py b/ethel/runners/clanganalyzer.py
index f471316..a3cc7aa 100644
--- a/ethel/runners/clanganalyzer.py
+++ b/ethel/runners/clanganalyzer.py
@@ -72,9 +72,10 @@ def clanganalyzer(package, suite, arch, analysis):
         # worst, if we run several instances of virtual builders, this will fail because
         # by default /tmp is a bind mount from the physical server
         reports_dir = glob.glob(internal_report_dir+'*')
+        print reports_dir
 
         ### SCANDALOUS HACK !!
-        return analysis, reports_dir, failed
+        return analysis, out, reports_dir
 
 
 def version():

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