diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-30 15:52:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-01 14:29:31 +0100 |
commit | a26667054b726fa1a109b900b47755c2c1a78363 (patch) | |
tree | 10367a23bf344513dabf04eee25764cdf609d33b | |
parent | fec42d37a879c7616ad26640a4991fd9108790db (diff) | |
download | poky-a26667054b726fa1a109b900b47755c2c1a78363.tar.gz |
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 <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/event.py | 5 |
1 files changed, 1 insertions, 4 deletions
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): | |||
94 | evt_hmap = _event_handler_map.get(eid, {}) | 94 | evt_hmap = _event_handler_map.get(eid, {}) |
95 | for name, handler in _handlers.iteritems(): | 95 | for name, handler in _handlers.iteritems(): |
96 | if name in _catchall_handlers or name in evt_hmap: | 96 | if name in _catchall_handlers or name in evt_hmap: |
97 | try: | 97 | execute_handler(name, handler, event, d) |
98 | execute_handler(name, handler, event, d) | ||
99 | except Exception: | ||
100 | continue | ||
101 | 98 | ||
102 | ui_queue = [] | 99 | ui_queue = [] |
103 | @atexit.register | 100 | @atexit.register |