Catch keyboard interrupts (Ctrl+C)

2 files changed, 12 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 0ef1408..9e4d793 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
 CHANGES
 -------
 
+Version TODO
+===================================
+
+ - Fixed: Catch keyboard interrupts (Ctrl+C) while
+     running child processes properly
+
+
 Version 1.4.0 - Released 2010-07-08
 ===================================
 
diff --git a/layman/overlays/source.py b/layman/overlays/source.py
index 9836526..2c039c9 100644
--- a/layman/overlays/source.py
+++ b/layman/overlays/source.py
@@ -148,7 +148,11 @@ class OverlaySource(object):
             # Make child non-interactive
             proc.stdin.close()
 
-        result = proc.wait()
+        try:
+            result = proc.wait()
+        except KeyboardInterrupt:
+            OUT.info('Interrupted manually', 2)
+            result = 1
 
         if self.quiet:
             output_target.close()