summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb/parse
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/bb/parse
parentdc98b2c28c0a7a7ea715230a234bb846a18e4584 (diff)
downloadopenembedded-core-221ac2b25f544a500869667d8f95c6c12c80db1a.tar.gz
openembedded-core-221ac2b25f544a500869667d8f95c6c12c80db1a.tar.bz2
openembedded-core-221ac2b25f544a500869667d8f95c6c12c80db1a.tar.xz
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/lib/bb/parse')
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index e6488bbe1..f8a49689e 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):
init(data)
if include == 0:
- bb.data.inheritFromOS(data)
oldfile = None
else:
oldfile = bb.data.getVar('FILE', data)