summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
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-21 21:58:06 +0100
commit08af663a15d5ddfabe8eeb07e52f69c48fd46baf (patch)
tree3ba1f6cf51438f8fed1554a1b888acb20d6490cd /bitbake/lib/bb
parentf1d8f1e6931f349ae701b407930506c78aaafe37 (diff)
downloadpoky-08af663a15d5ddfabe8eeb07e52f69c48fd46baf.tar.gz
bitbake: 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. (Bitbake rev: 51ca5193a5674b27d816140b0254f485912177a2) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cookerdata.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 9e88f9571d..b07c266439 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -292,7 +292,7 @@ class CookerDataBuilder(object):
292 bb.event.fire(bb.event.ConfigParsed(), mcdata) 292 bb.event.fire(bb.event.ConfigParsed(), mcdata)
293 self.mcdata[config] = mcdata 293 self.mcdata[config] = mcdata
294 294
295 except SyntaxError: 295 except (SyntaxError, bb.BBHandledException):
296 raise bb.BBHandledException 296 raise bb.BBHandledException
297 except bb.data_smart.ExpansionError as e: 297 except bb.data_smart.ExpansionError as e:
298 logger.error(str(e)) 298 logger.error(str(e))