summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-16 20:09:03 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-16 20:09:03 +0000
commitcd937b6f4501a738096efcf5e75308d26cc06765 (patch)
tree689b5d309c6132ef19440855f616729ca9ca2801 /bitbake/lib/bb/parse
parent31511eb9787014c26faf72be1d4d7329251727d9 (diff)
downloadpoky-cd937b6f4501a738096efcf5e75308d26cc06765.tar.gz
ConfHandler.py: revert accidental commit
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5197 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, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index f8a49689e2..e6488bbe11 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -118,6 +118,7 @@ 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)
121 oldfile = None 122 oldfile = None
122 else: 123 else:
123 oldfile = bb.data.getVar('FILE', data) 124 oldfile = bb.data.getVar('FILE', data)