Confhandler.py: Add cleanup from bitbake trunk

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

1 files changed, 3 insertions, 6 deletions

diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 4bc2bbc2b7..6c0a8cceaf 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -117,14 +117,11 @@ def handle(fn, data, include = 0):
         oldfile = bb.data.getVar('FILE', data)
 
     fn = obtain(fn, data)
-    bbpath = []
     if not os.path.isabs(fn):
         f = None
-        vbbpath = bb.data.getVar("BBPATH", data)
-        if vbbpath:
-            bbpath += vbbpath.split(":")
-        for p in bbpath:
-            currname = os.path.join(bb.data.expand(p, data), fn)
+        bbpath = bb.data.getVar("BBPATH", data, 1) or []
+        for p in bbpath.split(":"):
+            currname = os.path.join(p, fn)
             if os.access(currname, os.R_OK):
                 f = open(currname, 'r')
                 abs_fn = currname