[Pkg-debile-commits] [debile-slave] 01/02: Remove UUID definitely

[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-slave.

commit 8be5bd7af623265abf71b4568dc017ac37943edb
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Fri Aug 23 13:18:56 2013 +0200

    Remove UUID definitely
---
 debile/slave/daemon.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debile/slave/daemon.py b/debile/slave/daemon.py
index 555f565..cdbc8f4 100644
--- a/debile/slave/daemon.py
+++ b/debile/slave/daemon.py
@@ -31,18 +31,18 @@ def workon(suites, arches, capabilities):
     if job is None:
         yield
     else:
-        logging.info("Acquired job uuid=%s (%s) for %s/%s",
-                     job['uuid'], job['type'], job['suite'], job['arch'])
+        logging.info("Acquired job id=%s (%s) for %s/%s",
+                     job['id'], job['type'], job['suite'], job['arch'])
         try:
             yield job
         except:
             logging.warn("Forfeiting the job because of internal exception")
             print job
-            proxy.forfeit_job(job['uuid'])
+            proxy.forfeit_job(job['id'])
             raise
         else:
             logging.info("Successfully closing the job")
-            proxy.close_job(job['uuid'], job['failed'])
+            proxy.close_job(job['id'], job['failed'])
 
 
 def generate_sut_from_source(package):
@@ -108,7 +108,7 @@ 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_write_location(job['uuid'])
+                        proxy.get_write_location(job['id'])
                     remote_firehose_path = \
                         os.path.join(remote_firehose_path, 'firehose.xml')
                     cmd = config.get('master', 'copy')\
@@ -122,7 +122,7 @@ def iterate():
                         else:
                             job['failed'] = True
                             remote_scanbuild_path = \
-                                proxy.get_write_location(job['uuid'])
+                                proxy.get_write_location(job['id'])
                             remote_scanbuild_path = \
                                 os.path.join(
                                     remote_scanbuild_path,
@@ -136,7 +136,7 @@ def iterate():
                         job['failed'] = failed
 
                     logging.info("Sending the logs to the pool")
-                    remote_log_path = proxy.get_write_location(job['uuid'])
+                    remote_log_path = proxy.get_write_location(job['id'])
                     remote_log_path = os.path.join(remote_log_path, 'log.txt')
                     open('job-log', 'wb').write(log.encode('utf-8'))
                     cmd = config.get('master', 'copy')\

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