From dbdf036787a00c16919b2cfdbad9ef7bb01614c0 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 16 Oct 2011 12:04:04 +0200 Subject: [PATCH] do not need to use terminate()/SIGTERM Signed-off-by: Nico Schottelius --- bin/cdist | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/cdist b/bin/cdist index a07763f9..14cff65a 100755 --- a/bin/cdist +++ b/bin/cdist @@ -150,9 +150,12 @@ def configinstall(args, mode): except KeyboardInterrupt: if args.parallel: for p in process.keys(): - pid = process[p].pid.__str__() - log.warn("Terminating deploy " + p + " (" + pid + ")") - process[p].terminate() + # NOT needed: KeyBoardInterrupet (aka SIGINT) + # is forwarded to processes spawned by multiprocess! + # pid = process[p].pid.__str__() + #log.warn("Terminating deploy " + p + " (" + pid + ")") + # process[p].terminate() + pass sys.exit(0) @@ -182,6 +185,7 @@ def configinstall_onehost(host, args, mode, parallel): if not parallel: raise else: + # Catch here, above does not need to know about our errors return False return True