Patchwork [bitbake-devel,v2] event: Fix event handlers to raise SkipPackage

login
register
mail settings
Submitter Richard Purdie
Date May 30, 2014, 2:52 p.m.
Message ID <1401461579.31309.48.camel@ted>
Download mbox | patch
Permalink /patch/73007/
State New
Headers show

Comments

Richard Purdie - May 30, 2014, 2:52 p.m.
If an event handler triggers a SkipPackage event, we really want that
event to be received and processed by the higher code levels. Currently
it was getting caught and ignored which was leading to recipes
being present when they clearly shouldn't have been.

In general this exception catching looks to be doing the wrong thing. It
was introduced in
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/bitbake/lib/bb/event.py?id=37cb4cc02b2e2b6c338c5943747e0a1ef15176b3
but we likely want exceptions to pass through to the higher layers.

This patch therefore removes that code.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Patch

diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index e205043..04d775c 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -94,10 +94,7 @@  def fire_class_handlers(event, d):
     evt_hmap = _event_handler_map.get(eid, {})
     for name, handler in _handlers.iteritems():
         if name in _catchall_handlers or name in evt_hmap:
-            try:
-                execute_handler(name, handler, event, d)
-            except Exception:
-                continue
+            execute_handler(name, handler, event, d)
 
 ui_queue = []
 @atexit.register