diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-06 15:31:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-06 15:31:49 +0000 |
commit | f68af40555b6b73345805cfb99ca96e3ce27cb35 (patch) | |
tree | 05eada118799ebb9c6f3ba193f4c60bfdde5f1fa /lib | |
parent | 7d85b1a383feaa072503d71d3baeb3bdcd1012a8 (diff) | |
download | bitbake-f68af40555b6b73345805cfb99ca96e3ce27cb35.tar.gz |
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.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bb/cooker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 1b84e86bd..9f7121fef 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): |