From 08af663a15d5ddfabe8eeb07e52f69c48fd46baf Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 15 Sep 2016 15:57:21 -0500 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/cookerdata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): 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))