diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2021-02-23 11:18:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-11 14:04:45 +0000 |
commit | d3a0f074bcfcc5d158709906c37af76110418f0d (patch) | |
tree | 7935cf0ced0ff8c5715e957032982445e99dafe9 /bitbake | |
parent | 1d2fc389f957fab88bf1987148db52a9c3e50385 (diff) | |
download | poky-d3a0f074bcfcc5d158709906c37af76110418f0d.tar.gz |
bitbake: event.py: fix regression about INVALIDCONF
A previous commit uses __BBHANDLERS_MC to record all handlers, but
it does not take into consideration of INVALIDCONF, thus causing regression.
We need to record the name before returned AlreadyRegistered, otherwise, when
reparsing due to INVALIDCONF, bascially all handlers are not called.
(Bitbake rev: f6fb6f22fa6ba1ffe121948d7f53ac724358491e)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/event.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index 23e1f3187b..3e5718395b 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py | |||
@@ -238,6 +238,10 @@ def register(name, handler, mask=None, filename=None, lineno=None, data=None): | |||
238 | 238 | ||
239 | # already registered | 239 | # already registered |
240 | if name in _handlers: | 240 | if name in _handlers: |
241 | if data: | ||
242 | bbhands_mc = (data.getVar("__BBHANDLERS_MC") or []) | ||
243 | bbhands_mc.append(name) | ||
244 | data.setVar("__BBHANDLERS_MC", bbhands_mc) | ||
241 | return AlreadyRegistered | 245 | return AlreadyRegistered |
242 | 246 | ||
243 | if handler is not None: | 247 | if handler is not None: |