[Pkg-debile-commits] [debile-slave] 07/28: Use the new function to get write location path

[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 30bad9bcb9678ed0b46ea240fb694d898946066d
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Fri Aug 9 22:59:50 2013 +0200

    Use the new function to get write location path
---
 ethel/daemon.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ethel/daemon.py b/ethel/daemon.py
index e57fbef..d2a384d 100644
--- a/ethel/daemon.py
+++ b/ethel/daemon.py
@@ -10,6 +10,7 @@ from ethel.config import Config
 import logging
 import time
 import shutil
+import os
 
 config = Config()
 proxy = get_proxy()
@@ -105,7 +106,8 @@ def iterate():
 
                     logging.info("Sending the XML firehose report to the pool")
                     open('firehose.xml', 'w').write(firehose.to_xml_bytes())
-                    remote_firehose_path = proxy.get_firehose_write_location(job['uuid'])
+                    remote_firehose_path = proxy.get_write_location(job['uuid'])
+                    remote_firehose_path = os.path.join(remote_firehose_path, 'firehose.xml')
                     cmd = config.get('lucy', 'copy').format(src='firehose.xml',
                                                 dest=remote_firehose_path)
                     out, err, ret = run_command(cmd)
@@ -117,7 +119,8 @@ def iterate():
                         else:
                             job['failed'] = True
                             logging.info("SCANDALOUS HACK sending scan-build HTML reports")
-                            remote_path = proxy.get_scanbuildhtml_write_location(job['uuid'])
+                            remote_scanbuild_path = proxy.get_write_location(job['uuid'])
+                            remote_scanbuild_path = os.path.join(remote_scanbuild_path, 'scan-build')
                             cmd = config.get('lucy', 'copy').format(src=failed[0],
                                                         dest=remote_path)
                             out, err, ret = run_command(cmd)
@@ -126,7 +129,8 @@ def iterate():
                         job['failed'] = failed
 
                     logging.info("Sending the logs to the pool")
-                    remote_path = proxy.get_log_write_location(job['uuid'])
+                    remote_log_path = proxy.get_write_location(job['uuid'])
+                    remote_log_path = os.path.join(remote_log_path, 'log.txt')
                     open('ethel-log', 'wb').write(log.encode('utf-8'))
                     cmd = config.get('lucy', 'copy').format(src='ethel-log',
                                                 dest=remote_path)

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