summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-27 09:10:38 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-27 09:10:38 +0000
commit1e95d39948bff9d890bcf275cadbf98ecffec512 (patch)
tree133af646d089e7c2a804a7e479c53d1483b16457
parent9f10a98f448568f9e728bf827320def8732200eb (diff)
downloadpoky-1e95d39948bff9d890bcf275cadbf98ecffec512.tar.gz
Confhandler.py: Add cleanup from bitbake trunk
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@962 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py9
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):
117 oldfile = bb.data.getVar('FILE', data) 117 oldfile = bb.data.getVar('FILE', data)
118 118
119 fn = obtain(fn, data) 119 fn = obtain(fn, data)
120 bbpath = []
121 if not os.path.isabs(fn): 120 if not os.path.isabs(fn):
122 f = None 121 f = None
123 vbbpath = bb.data.getVar("BBPATH", data) 122 bbpath = bb.data.getVar("BBPATH", data, 1) or []
124 if vbbpath: 123 for p in bbpath.split(":"):
125 bbpath += vbbpath.split(":") 124 currname = os.path.join(p, fn)
126 for p in bbpath:
127 currname = os.path.join(bb.data.expand(p, data), fn)
128 if os.access(currname, os.R_OK): 125 if os.access(currname, os.R_OK):
129 f = open(currname, 'r') 126 f = open(currname, 'r')
130 abs_fn = currname 127 abs_fn = currname