[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-102-g4c48ac2

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 53516e5ba6eb5ac99355bf986e25d5287475b3b3
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed Jun 20 22:31:59 2012 +0200

    p-s: submit logs after (single) Ctrl-C
    
    if the slave is interrupted gracefully with a single Ctrl-C
    to terminate after finishing the current test, also submit
    the finished logs
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 1e5588f..5992ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ piuparts (0.46) UNRELEASED; urgency=low
       precedence settings.
     - Skip connection to master if we have reserved but no submittable logs.
     - Submit finished logs after completing all reserved logs in a section.
+    - Send finished logs to master if interrupted with a single Ctrl-C.
     - Add SIGHUP handler that triggers flushing finished logs.  Flushing (all
       sections) will be done after the current test has finished.
   * piuparts-report.py:
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 0c62b06..f28899b 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -479,8 +479,10 @@ class Section:
                             "Package %s not found\n" % package_name)
             self._slave.forget_reserved(package_name, version)
             if interrupted:
-                raise KeyboardInterrupt
+                break
         self._talk_to_master()
+        if interrupted:
+            raise KeyboardInterrupt
         return test_count
 
 

-- 
piuparts git repository