Removed extraneous traceback upon user interruption.

soravux · Apr 20, 2016 · a576bf1 · a576bf1
1 parent 3f84f67
commit a576bf1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/scoop/launch/__main__.py b/scoop/launch/__main__.py
@@ -96,7 +96,10 @@ def launchBootstraps():
     if was_origin:
         # Only wait on the origin, this will return and notify the launcher
         # the the job has finished and start the cleanup phase
-        processes[0].wait()
+        try:
+            processes[0].wait()
+        except KeyboardInterrupt:
+            pass
     else:
         for p in processes:
             p.wait()

diff --git a/scoop/launcher.py b/scoop/launcher.py
@@ -307,10 +307,13 @@ def run(self):
         rootProcess = shells[0][0]
 
         # Wait for the root program
-        if self.workers[0].isLocal():
-            self.errors = self.workers[0].subprocesses[0].wait()
-        else:
-            self.errors = rootProcess.wait()
+        try:
+            if self.workers[0].isLocal():
+                self.errors = self.workers[0].subprocesses[0].wait()
+            else:
+                self.errors = rootProcess.wait()
+        except KeyboardInterrupt:
+            pass
         scoop.logger.info('Root process is done.')
         return self.errors