From cd937b6f4501a738096efcf5e75308d26cc06765 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 16 Sep 2008 20:09:03 +0000
Subject: ConfHandler.py: revert accidental commit

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5197 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 bitbake/lib/bb/parse/parse_py/ConfHandler.py | 1 +
 1 file changed, 1 insertion(+)

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