[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6474/8267] bitbake: event: remove mapping for deleted event handlers

[Emmanuele Bassi <ebassi src gnome org>]

commit d591b00af06abd197904902baed3a6d2fcb5dbc6
Author: Jair Gonzalez <jair de jesus gonzalez plascencia linux intel com>
Date:   Mon Feb 20 17:54:25 2017 -0600

    bitbake: event: remove mapping for deleted event handlers
    
    The current remove method for class event handlers does not update the
    event mapping after an event handler is deleted from the main dictionary.
    
    This change enhances the remove method by also updating the event mapping
    accordingly.
    
    This was detected after creating the bb.tests.event module.
    
    [YOCTO #10368]
    
    (Bitbake rev: 839f83dea1e99d1d182b138e5aea1df1c45a92fc)
    
    Signed-off-by: Jair Gonzalez <jair de jesus gonzalez plascencia linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/event.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index eb5cd04..6ccd4bd 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -264,6 +264,11 @@ def register(name, handler, mask=None, filename=None, lineno=None):
 def remove(name, handler):
     """Remove an Event handler"""
     _handlers.pop(name)
+    if name in _catchall_handlers:
+        _catchall_handlers.pop(name)
+    for event in _event_handler_map.keys():
+        if name in _event_handler_map[event]:
+            _event_handler_map[event].pop(name)
 
 def get_handlers():
     return _handlers
@@ -762,4 +767,3 @@ class NetworkTestFailed(Event):
     """
     Event to indicate network test has failed
     """
-