[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2553/8267] bitbake: cookerdata.py: Catch BBHandledException, preventing a backtrace in an event

[Emmanuele Bassi <ebassi src gnome org>]

commit 08af663a15d5ddfabe8eeb07e52f69c48fd46baf
Author: Mark Hatle <mark hatle windriver com>
Date:   Thu Sep 15 15:57:21 2016 -0500

    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>

 bitbake/lib/bb/cookerdata.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 9e88f95..b07c266 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))