From c0db739f3525f935ecb5a32f3b2ff26df92ff252 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 12 May 2016 08:15:34 +0100 Subject: bitbake: main: Ensure exceptions are correctly displayed If the cooker fails to start, ensure a correct exception is displayed to the user. After handling any queued events simply re-raise the original exception else the output can be unclear. (Bitbake rev: 9a4db1aa608c17d31bf5ea1cab5a99beb565dd83) Signed-off-by: Richard Purdie --- bitbake/lib/bb/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index eb15779fac..761ea459cf 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py @@ -335,7 +335,6 @@ def start_server(servermodule, configParams, configuration, features): server.addcooker(cooker) server.saveConnectionDetails() except Exception as e: - exc_info = sys.exc_info() while hasattr(server, "event_queue"): try: import queue @@ -347,7 +346,7 @@ def start_server(servermodule, configParams, configuration, features): break if isinstance(event, logging.LogRecord): logger.handle(event) - raise exc_info[1], None, exc_info[2] + raise server.detach() cooker.lock.close() return server -- cgit v1.2.3-54-g00ecf