summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/bb/parse/__init__.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/bb/parse/__init__.py b/lib/bb/parse/__init__.py
index 2a7897cdf..1bd4aa150 100644
--- a/lib/bb/parse/__init__.py
+++ b/lib/bb/parse/__init__.py
@@ -82,9 +82,11 @@ def init(fn, data):
def resolve_file(fn, d):
if not os.path.isabs(fn):
- fn = bb.which(bb.data.getVar("BBPATH", d, 1), fn)
- if not fn:
- raise IOError("file %s not found" % fn)
+ bbpath = bb.data.getVar("BBPATH", d, True)
+ newfn = bb.which(bbpath, fn)
+ if not newfn:
+ raise IOError("file %s not found in %s" % (fn, bbpath))
+ fn = newfn
bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % fn)
return fn