summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-17 12:12:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:44 +0100
commite0daf784082f27372effa04e987ba7376a26175a (patch)
treec4c31e9dd1e07e6d7a873529388ac8fd0cba34e4 /bitbake/lib/bb
parent715d857174ceca82b85d6c8c7df520047ba7fb0c (diff)
downloadpoky-e0daf784082f27372effa04e987ba7376a26175a.tar.gz
bitbake: command: intercept SystemExit to avoid trashing the server
If sys.exit() is called within a command run over XMLRPC, the XMLRPC server is effectively trashed (apparently listening but no longer able to respond to commands). We need to intercept the SystemExit exception and deal with it as we would any other exception. (Bitbake rev: 95e391acbc3b4efd6c77637a1ce815012ae0f09b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/command.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 24ff341045..a7cac97e2d 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -71,7 +71,7 @@ class Command:
71 result = command_method(self, commandline) 71 result = command_method(self, commandline)
72 except CommandError as exc: 72 except CommandError as exc:
73 return None, exc.args[0] 73 return None, exc.args[0]
74 except Exception: 74 except (Exception, SystemExit):
75 import traceback 75 import traceback
76 return None, traceback.format_exc() 76 return None, traceback.format_exc()
77 else: 77 else: