Skip to contentSkip to conversation

event: Handle recursive events and the data store better

PATCH New Richard Purdie 1 participant 1 message Jun 25, 2015

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

PATCH 1/1 event: Handle recursive events and the data store better

Events can call each other recursively, e.g. an event handler can call bb.note which in turn generates another event. If these loop, it can lead to multiple deletions of 'd' from __builtins__ which can fail since __builtins__ is global scope.

Add handling to only remove 'd' when we added it and it wasn't already present.

Signed-off-by Richard Purdie <[email protected]>
bitbake/lib/bb/event.py +6 -2
index 80e3796..6951e21 100644
@@ -72,7 +72,10 @@ _eventfilter = None
 
 def execute_handler(name, handler, event, d):
     event.data = d
-    __builtins__['d'] = d
+    addedd = False
+    if 'd' not in __builtins__:
+        __builtins__['d'] = d
+        addedd = True
     try:
         ret = handler(event)
     except bb.parse.SkipRecipe:

@@ -88,7 +91,8 @@ def execute_handler(name, handler, event, d):
             logger.error("Execution of event handler '%s' failed (exit code %s)" % (name, exc.code))
     finally:
         del event.data
-        del __builtins__['d']
+        if addedd:
+            del __builtins__['d']
 
 def fire_class_handlers(event, d):
     if isinstance(event, logging.LogRecord):