From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 10 Sep 2010 00:57:09 +0000 (-0700)
Subject: Don't show uncaught exception message for KeyboardInterrupt
X-Git-Tag: 2011-1~3165
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0533a8465b4392c44f86a1b38f348a015f7f5c4c;p=openembedded-core.git

Don't show uncaught exception message for KeyboardInterrupt

(Bitbake rev: 29634acd262b06fd14f6ef1e134346f274cf448f)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 470e9dcc43..e6ce8d9438 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -58,7 +58,11 @@ class BBConfiguration(object):
 
 
 def print_exception(*exc_info):
-    logger.error("Uncaught exception: ", exc_info=exc_info)
+    if not isinstance(exc_info[0], SystemExit):
+        if isinstance(exc_info[0], KeyboardInterrupt):
+            logger.error("User aborted.")
+        else:
+            logger.error("Uncaught exception: ", exc_info=exc_info)
     sys.exit(1)
 
 sys.excepthook = print_exception