Confhandler.py: Add cleanup from bitbake trunk

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@962 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2006-11-27 09:10:38 +00:00
parent 9f10a98f44
commit 1e95d39948
1 changed files with 3 additions and 6 deletions

View File

@ -117,14 +117,11 @@ def handle(fn, data, include = 0):
oldfile = bb.data.getVar('FILE', data) oldfile = bb.data.getVar('FILE', data)
fn = obtain(fn, data) fn = obtain(fn, data)
bbpath = []
if not os.path.isabs(fn): if not os.path.isabs(fn):
f = None f = None
vbbpath = bb.data.getVar("BBPATH", data) bbpath = bb.data.getVar("BBPATH", data, 1) or []
if vbbpath: for p in bbpath.split(":"):
bbpath += vbbpath.split(":") currname = os.path.join(p, fn)
for p in bbpath:
currname = os.path.join(bb.data.expand(p, data), fn)
if os.access(currname, os.R_OK): if os.access(currname, os.R_OK):
f = open(currname, 'r') f = open(currname, 'r')
abs_fn = currname abs_fn = currname