From d3a0f074bcfcc5d158709906c37af76110418f0d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 23 Feb 2021 11:18:28 +0800 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/event.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bitbake/lib/bb') 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): # already registered if name in _handlers: + if data: + bbhands_mc = (data.getVar("__BBHANDLERS_MC") or []) + bbhands_mc.append(name) + data.setVar("__BBHANDLERS_MC", bbhands_mc) return AlreadyRegistered if handler is not None: -- cgit v1.2.3-54-g00ecf