[oe-commits] Richard Purdie : base.bbclass: Merge two ConfigParsed event handlers

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ff919ed132b543f70e9635be7a31f799aafcf8d6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ff919ed132b543f70e9635be7a31f799aafcf8d6

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Mar 26 09:31:09 2014 +0000

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 <richard.purdie at linuxfoundation.org>

---

 meta/classes/base.bbclass | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 7c39db9..f4f5321 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -36,13 +36,6 @@ def oe_import(d):
 # We need the oe module name space early (before INHERITs get added)
 OE_IMPORTED := "${@oe_import(d)}"
 
-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
@@ -294,6 +287,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)