event: Fix event handlers to raise SkipPackage
PATCH 1/1 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.
bitbake/lib/bb/event.py +2 -0
@@ -96,6 +96,8 @@ def fire_class_handlers(event, d): if name in _catchall_handlers or name in evt_hmap: try: execute_handler(name, handler, event, d) + except bb.parse.SkipPackage: + raise except Exception: continue
Quoted 12 lines · Richard Purdie
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.
Signed-off-by Richard Purdie <[email protected]>bitbake/lib/bb/event.py +0
-0
bitbake/lib/bb/event.py def fire_class_handlers(event, d): · line 103
Quoted 8 lines
bitbake/lib/bb/event.py +2
-0@@ -96,6 +96,8 @@ def fire_class_handlers(event, d): if name in _catchall_handlers or name in evt_hmap: try: execute_handler(name, handler, event, d) + except bb.parse.SkipPackage: + raise except Exception: continue
I'm just looking at another bug and this try/except Exception doesn't make sense to me. It basically comes from:
although the BaseException was changed to an Exception so that SystemExit would pass through.
The problem is that if a handler like ConfigParsed raises an error staying "eek stop", the system will merrily swallow it and the build will continue. Ditto something like an ExpansionError.
Specifically, I really want to do:
since actually raising a SystemExit is pretty evil. Most of the build works fine with this, except for the event handlers and its due to the above clause. I've long wondered where the problem was but never dug into it as yet, it now turns out its this.
So is there a good reason to keep that "continue" there or can we remove this and assume is the handler is raising an exception, its an error?
Chris, any thoughts on what this was aiming to do originally?
Cheers,
Richard
PATCH v2 1/1 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/lib/bb/event.py +1 -4
@@ -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