From 221ac2b25f544a500869667d8f95c6c12c80db1a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 Sep 2008 20:46:17 +0000 Subject: bitbake/bitbake-dev: Sync with upstream git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5346 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake-dev/lib/bb/cooker.py | 4 ++++ bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake-dev/lib') 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) -- cgit v1.2.3