summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-20 23:00:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-22 12:10:13 +0100
commit308ae9210067da0348f2cf2b6d56a7dce5b45936 (patch)
tree9027e7cb4ea8ec18eca3beff6cacf8ea20ae5528
parent77fc40a0f843e2488b356d90b64ef436c11c9973 (diff)
downloadpoky-308ae9210067da0348f2cf2b6d56a7dce5b45936.tar.gz
bitbake: bin/bitbake: Improve exception handling
Due to the internal event processing, this excepting handler usually raises an Empty error, masking the underlying failure. Ensure the original exception is raised. (Bitbake rev: 7d548568a55adfe84a976f2a549995e42da1afef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 0ca82e5a7b..5b9294bf4e 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -250,7 +250,8 @@ Default BBFILES are the .bb files in the current directory.""")
250 250
251 server.addcooker(cooker) 251 server.addcooker(cooker)
252 server.saveConnectionDetails() 252 server.saveConnectionDetails()
253 except: 253 except Exception as e:
254 exc_info = sys.exc_info()
254 while True: 255 while True:
255 try: 256 try:
256 import queue 257 import queue
@@ -262,7 +263,7 @@ Default BBFILES are the .bb files in the current directory.""")
262 break 263 break
263 if isinstance(event, logging.LogRecord): 264 if isinstance(event, logging.LogRecord):
264 logger.handle(event) 265 logger.handle(event)
265 raise 266 raise exc_info[1], None, exc_info[2]
266 server.detach() 267 server.detach()
267 268
268 # Should no longer need to ever reference cooker 269 # Should no longer need to ever reference cooker