summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-04-09 22:16:40 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-04-09 22:16:40 +0000
commit632770e8d2beca177f1e492f5940c0a66a84bb09 (patch)
treec4abe023eeb08705dad36606ece3385fa65b27e6 /classes
parentc89f99d26d4c54205988d91ca2417075ba737bc8 (diff)
base.bbclass: Merge two after parse functions
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass10
1 files changed, 3 insertions, 7 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 6011790ebe..aa693cd4c6 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -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 @@ def base_after_parse(d):
python () {
- base_after_parse_two(d)
base_after_parse(d)
}