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>

diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index 9e88f9571dc5acf9a322a785805e53722bd611a1..b07c266439358eda16ad8d54753c826dab1206b2 100644 (file)
--- 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))