diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-09-30 20:46:17 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-09-30 20:46:17 +0000 |
| commit | 221ac2b25f544a500869667d8f95c6c12c80db1a (patch) | |
| tree | cb14f631faeb933c4dc0e52aee2c1b383bb2da4d /bitbake-dev/lib | |
| parent | dc98b2c28c0a7a7ea715230a234bb846a18e4584 (diff) | |
| download | openembedded-core-221ac2b25f544a500869667d8f95c6c12c80db1a.tar.gz openembedded-core-221ac2b25f544a500869667d8f95c6c12c80db1a.tar.bz2 openembedded-core-221ac2b25f544a500869667d8f95c6c12c80db1a.zip | |
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-dev/lib')
| -rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 4 | ||||
| -rw-r--r-- | bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 8eb1a410f2..1531808613 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/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/bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py b/bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py index e6488bbe11..f8a49689e2 100644 --- a/bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake-dev/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) |