From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 2 Mar 2010 21:17:17 +0000 (-0500)
Subject: main.py: clean up subprocesses dying on signal.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1345eb6aaff6a62c603b8606ebb88c2961f4ed44;p=packages%2Fb%2Fbup.git

main.py: clean up subprocesses dying on signal.

CTRL-C didn't abort 'bup random' properly, and possibly others as well.
---

diff --git a/main.py b/main.py
index 8cd2293..d5b4ccc 100755
--- a/main.py
+++ b/main.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys, os, subprocess
+import sys, os, subprocess, signal
 
 argv = sys.argv
 exe = argv[0]
@@ -103,6 +103,15 @@ else:
     outf = 1
     errf = 2
 
+
+class SigException(Exception):
+    pass
+def handler(signum, frame):
+    raise SigException('signal %d received' % signum)
+
+signal.signal(signal.SIGTERM, handler)
+signal.signal(signal.SIGINT, handler)
+
 ret = 95
 try:
     try:
@@ -112,9 +121,12 @@ try:
     except OSError, e:
         log('%s: %s\n' % (subpath(subcmd), e))
         ret = 98
-    except KeyboardInterrupt, e:
+    except SigException, e:
         ret = 94
 finally:
+    if p and p.poll() == None:
+        os.kill(p.pid, signal.SIGTERM)
+        p.wait()
     if n:
         n.stdin.close()
         try: