summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-30 20:46:17 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-30 20:46:17 +0000
commit221ac2b25f544a500869667d8f95c6c12c80db1a (patch)
treecb14f631faeb933c4dc0e52aee2c1b383bb2da4d /bitbake/lib
parentdc98b2c28c0a7a7ea715230a234bb846a18e4584 (diff)
downloadpoky-221ac2b25f544a500869667d8f95c6c12c80db1a.tar.gz
bitbake/bitbake-dev: Sync with upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5346 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py4
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py1
-rw-r--r--bitbake/lib/bb/utils.py1
3 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8e6acb19fc..50624d8d33 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -59,6 +59,10 @@ class BBCooker:
59 59
60 self.configuration.data = bb.data.init() 60 self.configuration.data = bb.data.init()
61 61
62 def parseConfiguration(self):
63
64 bb.data.inheritFromOS(self.configuration.data)
65
62 for f in self.configuration.file: 66 for f in self.configuration.file:
63 self.parseConfigurationFile( f ) 67 self.parseConfigurationFile( f )
64 68
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index e6488bbe11..f8a49689e2 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -118,7 +118,6 @@ def handle(fn, data, include = 0):
118 init(data) 118 init(data)
119 119
120 if include == 0: 120 if include == 0:
121 bb.data.inheritFromOS(data)
122 oldfile = None 121 oldfile = None
123 else: 122 else:
124 oldfile = bb.data.getVar('FILE', data) 123 oldfile = bb.data.getVar('FILE', data)
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 211ac8129f..9c8d8e8435 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -305,3 +305,4 @@ def prunedir(topdir):
305 for name in dirs: 305 for name in dirs:
306 os.rmdir(os.path.join(root, name)) 306 os.rmdir(os.path.join(root, name))
307 os.rmdir(topdir) 307 os.rmdir(topdir)
308