[bitbake-devel][PATCH V2] event.py: fix regression about INVALIDCONF

[bitbake-devel][PATCH V2] event.py: fix regression about INVALIDCONF

[Chen Qi]

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.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 lib/bb/event.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/bb/event.py b/lib/bb/event.py
index 23e1f318..3e571839 100644
--- a/lib/bb/event.py
+++ b/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:
-- 
2.17.1

Re: [bitbake-devel][PATCH V2] event.py: fix regression about INVALIDCONF

[Chen Qi]

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

ping

On 02/23/2021 11:18 AM, Chen Qi wrote:
> 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.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>   lib/bb/event.py | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/lib/bb/event.py b/lib/bb/event.py
> index 23e1f318..3e571839 100644
> --- a/lib/bb/event.py
> +++ b/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:
>
>
> 
>


[-- Attachment #2: Type: text/html, Size: 1593 bytes --]