summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-06-04 13:10:00 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:35 +0100
commit9d32ff0c87b5cbf420efb0fd8ce5d7182863b634 (patch)
tree22437367e872e073100d0188b69c773e310c9e10 /bitbake/lib/bb
parent85ca18f60a540354e4b2ba27d29b0270c1ec8d7f (diff)
downloadopenembedded-core-9d32ff0c87b5cbf420efb0fd8ce5d7182863b634.tar.gz
openembedded-core-9d32ff0c87b5cbf420efb0fd8ce5d7182863b634.tar.bz2
openembedded-core-9d32ff0c87b5cbf420efb0fd8ce5d7182863b634.tar.xz
openembedded-core-9d32ff0c87b5cbf420efb0fd8ce5d7182863b634.zip
Make the file not found error actually useable.
(Bitbake rev: 1cfcbee014478eb129ed382c13622317412b036e) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/parse/__init__.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py
index 4b957884c..fc06841d3 100644
--- a/bitbake/lib/bb/parse/__init__.py
+++ b/bitbake/lib/bb/parse/__init__.py
@@ -81,9 +81,11 @@ def init(fn, data):
def resolve_file(fn, d):
if not os.path.isabs(fn):
- fn = bb.utils.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