From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 6 Mar 2013 15:31:49 +0000 (+0000)
Subject: Revert "cooker: now that we use a Pool, raise the exceptions"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f68af40555b6b73345805cfb99ca96e3ce27cb35;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

Revert "cooker: now that we use a Pool, raise the exceptions"

Reverting the pool changes, terminate does not work reliably on
bb.compat.Pool :(

This reverts commit 9ca8e513dc142dd7aefadeb6db2ccdb00f38b39f.
---

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 1b84e86bd7b..9f7121fefcf 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1563,12 +1563,12 @@ def parse_file((filename, appends, caches_array)):
         tb = sys.exc_info()[2]
         exc.recipe = filename
         exc.traceback = list(bb.exceptions.extract_traceback(tb, context=3))
-        raise
+        return True, exc
     # Need to turn BaseExceptions into Exceptions here so we gracefully shutdown
     # and for example a worker thread doesn't just exit on its own in response to
     # a SystemExit event for example.
     except BaseException as exc:
-        raise ParsingFailure(exc, filename)
+        return True, ParsingFailure(exc, filename)
 
 class CookerParser(object):
     def __init__(self, cooker, filelist, masked):