From 9d32ff0c87b5cbf420efb0fd8ce5d7182863b634 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 4 Jun 2010 13:10:00 -0700
Subject: 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>
---
 bitbake/lib/bb/parse/__init__.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'bitbake')

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
-- 
cgit v1.2.3