[oe-commits] org.oe.dev base.bbclass: Merge two after parse functions

[rpurdie commit]

base.bbclass: Merge two after parse functions

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 7c9c87f800b051a6ee4a76706eb3b7133b5f070c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7c9c87f800b051a6ee4a76706eb3b7133b5f070c
Files:
1
classes/base.bbclass
Diffs:

#
# mt diff -r8a8c931a85ea0693a8522c7123b4127c0cabc431 -r7c9c87f800b051a6ee4a76706eb3b7133b5f070c
#
# 
# 
# patch "classes/base.bbclass"
#  from [a24e4e673608a40679457153103b591222ae0942]
#    to [0546d90a54ab6f65b8b3d2795ddca861e3c7f0f9]
# 
============================================================
--- classes/base.bbclass	a24e4e673608a40679457153103b591222ae0942
+++ classes/base.bbclass	0546d90a54ab6f65b8b3d2795ddca861e3c7f0f9
@@ -798,9 +798,9 @@ python read_subpackage_metadata () {
 			bb.data.setVar(key, sdata[key], d)
 }
 
-def base_after_parse_two(d):
-    import bb
-    import exceptions
+def base_after_parse(d):
+    import bb, os, exceptions
+
     source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
     if not source_mirror_fetch:
         need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
@@ -828,9 +828,6 @@ def base_after_parse_two(d):
     if use_nls != None:
         bb.data.setVar('USE_NLS', use_nls, d)
 
-def base_after_parse(d):
-    import bb, os
-
     # Make sure MACHINE *isn't* exported
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
@@ -855,7 +852,6 @@ python () {
 
 
 python () {
-    base_after_parse_two(d)
     base_after_parse(d)
 }