Mercurial > piecrust2

changeset 159:232989a6df36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for KeyboardInterrupt in bake process.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 31 Dec 2014 19:50:40 -0800
parents 1187739e5a19
children de09d41bae23
files piecrust/baking/baker.py
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/piecrust/baking/baker.py	Wed Dec 31 16:56:55 2014 -0800
+++ b/piecrust/baking/baker.py	Wed Dec 31 19:50:40 2014 -0800
@@ -301,8 +301,18 @@
     def _waitOnWorkerPool(self, pool, abort):
         for w in pool:
             w.start()
-        for w in pool:
-            w.join()
+
+        try:
+            for w in pool:
+                w.join()
+        except KeyboardInterrupt:
+            logger.warning("Bake aborted by user... "
+                           "waiting for workers to stop.")
+            abort.set()
+            for w in pool:
+                w.join()
+            raise
+
         if abort.is_set():
             excs = [w.abort_exception for w in pool
                     if w.abort_exception is not None]