base.bbclass: Merge two ConfigParsed event handlers

RFC PATCH In review Richard Purdie 1 participant 1 message Mar 26, 2014

lore

Share & tools

lore

Richard Purdie

author

2014-03-26 09:31 UTC #0 lore raw

RFC PATCH 2/3 base.bbclass: Merge two ConfigParsed event handlers

There were two ConfigParsed event handlers in base.bbclass, this merges them together for small efficiency wins.

Signed-off-by Richard Purdie <[email protected]>

---

meta/classes/base.bbclass +1 -7

index f085173..360b112 100644
@@ -38,13 +38,6 @@ def oe_import(d):
 BASEIMPORTS = "${@oe_import(d)}"
 inherit ${BASEIMPORTS}
 
-python oe_import_eh () {
-    e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data))
-}
-
-addhandler oe_import_eh
-oe_import_eh[eventmask] = "bb.event.ConfigParsed"
-
 def lsb_distro_identifier(d):
     adjust = d.getVar('LSB_DISTRO_ADJUST', True)
     adjust_func = None

@@ -296,6 +289,7 @@ addhandler base_eventhandler
 base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted"
 python base_eventhandler() {
     if isinstance(e, bb.event.ConfigParsed):
+        e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data))
         e.data.setVar('BB_VERSION', bb.__version__)
         pkgarch_mapping(e.data)
         preferred_ml_updates(e.data)