ConfHandler.py: revert accidental commit

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5197 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index f8a49689e2f7119f3b8ae2f41ad5d6e0734683f5..e6488bbe1129e7c6084c23a9428c048fb4a24954 100644 (file)
--- 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):
     init(data)
 
     if include == 0:
+        bb.data.inheritFromOS(data)
         oldfile = None
     else:
         oldfile = bb.data.getVar('FILE', data)