summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-06 15:31:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-06 15:40:56 +0000
commited76a48e6832c4a2015b9675e758f8c31229938e (patch)
tree57e75e8ee807c684319845ff5157be4f09ea2f35 /bitbake
parent6663b79452bcdd95fc69e1ec853baae6c5297ab2 (diff)
downloadpoky-ed76a48e6832c4a2015b9675e758f8c31229938e.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py4
1 files changed, 2 insertions, 2 deletions
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)):
1563 tb = sys.exc_info()[2] 1563 tb = sys.exc_info()[2]
1564 exc.recipe = filename 1564 exc.recipe = filename
1565 exc.traceback = list(bb.exceptions.extract_traceback(tb, context=3)) 1565 exc.traceback = list(bb.exceptions.extract_traceback(tb, context=3))
1566 raise 1566 return True, exc
1567 # Need to turn BaseExceptions into Exceptions here so we gracefully shutdown 1567 # Need to turn BaseExceptions into Exceptions here so we gracefully shutdown
1568 # and for example a worker thread doesn't just exit on its own in response to 1568 # and for example a worker thread doesn't just exit on its own in response to
1569 # a SystemExit event for example. 1569 # a SystemExit event for example.
1570 except BaseException as exc: 1570 except BaseException as exc:
1571 raise ParsingFailure(exc, filename) 1571 return True, ParsingFailure(exc, filename)
1572 1572
1573class CookerParser(object): 1573class CookerParser(object):
1574 def __init__(self, cooker, filelist, masked): 1574 def __init__(self, cooker, filelist, masked):