[oe-commits] [bitbake] 06/16: cookerdata.py: Catch BBHandledException, preventing a backtrace in an event

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 51ca5193a5674b27d816140b0254f485912177a2
Author: Mark Hatle <mark.hatle at windriver.com>
AuthorDate: Thu Sep 15 15:57:21 2016 -0500

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cookerdata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index 9e88f95..b07c266 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))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.