[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-755-ga3ab31d

Andreas Beckmann debian at abeckmann.de
Mon Jun 18 11:37:50 UTC 2012


The following commit has been merged in the piatti branch:
commit f5cc270bf9d45e795e4ad94b88cab9c42644710f
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Jun 15 15:10:43 2012 +0200

    p: cleanup chroot on Ctrl-C
    
    execute the panic handlers after receiving Ctrl-C
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 5ec71bc..f0f391f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,7 @@ piuparts (0.45) UNRELEASED; urgency=low
       chroot; also in case piuparts aborts due to an error.
     - Continue killing running processes as long as new processes get spawned
       in the chroot.
+    - Perform chroot cleanup after receiving Ctrl-C/SIGINT, too.
   * piuparts.conf:
     - Make master-command a [global] instead of a [section] setting.
       The section name will be given as an argument to this command.
diff --git a/piuparts.py b/piuparts.py
index 34746b8..663ce56 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2738,6 +2738,7 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         print ''
         print 'Piuparts interrupted by the user, exiting...'
+        panic(1)
         sys.exit(1)
 
 # vi:set et ts=4 sw=4 :

-- 
piuparts git repository



More information about the Piuparts-commits mailing list