[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-18-gb3f2627

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit c6672209691dcdc2c096ae3e1d688892aba4783c
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 23 12:06:42 2012 +0200

    p-s: fix wrong name of terminate method
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index c1954c5..6207541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ piuparts (0.46) UNRELEASED; urgency=low
   * piupartslib/packagesdb.py:
   * piuparts-master.py:
   * piuparts-slave.py:
+    - Fix stopping the currently running test (Ctrl-C Ctrl-C).
   * piuparts-report.py:
   * Simplify running piuparts from GIT.
   * Reorganize layout in the GIT repository to reduce path nesting and length.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 8090f96..2f7de1d 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -504,7 +504,7 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
     except KeyboardInterrupt:
         print '\nSlave interrupted by the user, cleaning up...'
         try:
-            kill_subprocess(p, kill_all)
+            terminate_subprocess(p, kill_all)
         except KeyboardInterrupt:
             print '\nTerminating piuparts was interrupted... manual cleanup still neccessary.'
             raise

-- 
piuparts git repository