From a26667054b726fa1a109b900b47755c2c1a78363 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 May 2014 15:52:59 +0100 Subject: bitbake: event: Fix event handlers to raise SkipPackage 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. (Bitbake rev: 79211b3434855942f9fad4a1db69ce7be911327c) Signed-off-by: Richard Purdie --- bitbake/lib/bb/event.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index e2050431ec..04d775c3cd 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 -- cgit v1.2.3-54-g00ecf