summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-09-15 15:57:21 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-20 15:18:35 +0100
commit51ca5193a5674b27d816140b0254f485912177a2 (patch)
treec0473021de7f0c2e001070053171bed9c47c728e
parent20cdc3d609f8aea992f97c3db336574d3a549973 (diff)
downloadbitbake-contrib-51ca5193a5674b27d816140b0254f485912177a2.tar.gz
cookerdata.py: Catch BBHandledException, preventing a backtrace in an event
The event handling 'Exception' was catching and triggering a backtrace. This trace was obscuring any errors from an event handler that had raised the BBHandledException, which should indicate do not print additional information. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cookerdata.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index 9e88f9571..b07c26643 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -292,7 +292,7 @@ class CookerDataBuilder(object):
bb.event.fire(bb.event.ConfigParsed(), mcdata)
self.mcdata[config] = mcdata
- except SyntaxError:
+ except (SyntaxError, bb.BBHandledException):
raise bb.BBHandledException
except bb.data_smart.ExpansionError as e:
logger.error(str(e))