cooker.py: Add parseConfiguration() function and move inheritFromOS call outside...

diff --git a/bin/bitbake b/bin/bitbake
index 72e26332e10d0e6a06393edaea31573ccc04f57c..6f0c9ed61a24ef0ed0705d1175acdfce37ab839c 100755 (executable)
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -140,6 +140,7 @@ Default BBFILES are the .bb files in the current directory.""" )
 
 
     cooker = bb.cooker.BBCooker(configuration)
+    cooker.parseConfiguration()
     host = cooker.server.host
     port = cooker.server.port
 

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 8eb1a410f214bbaaf6179923232f6562f907b2eb..1531808613d9340a166278c59b0d5fafb2263125 100644 (file)
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -86,6 +86,10 @@ class BBCooker:
 
         self.configuration.data = bb.data.init()
 
+    def parseConfiguration(self):
+
+        bb.data.inheritFromOS(self.configuration.data)
+
         for f in self.configuration.file:
             self.parseConfigurationFile( f )
 

diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py
index e6488bbe1129e7c6084c23a9428c048fb4a24954..f8a49689e2f7119f3b8ae2f41ad5d6e0734683f5 100644 (file)
--- a/lib/bb/parse/parse_py/ConfHandler.py
+++ b/lib/bb/parse/parse_py/ConfHandler.py
@@ -118,7 +118,6 @@ def handle(fn, data, include = 0):
     init(data)
 
     if include == 0:
-        bb.data.inheritFromOS(data)
         oldfile = None
     else:
         oldfile = bb.data.getVar('FILE', data)