From ed76a48e6832c4a2015b9675e758f8c31229938e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 6 Mar 2013 15:31:49 +0000 Subject: bitbake: 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. Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 1b84e86bd7..9f7121fefc 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/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): -- cgit v1.2.3-54-g00ecf