From: Chris Larson <clarson@kergoth.com>
Date: Sun, 19 Jul 2009 05:36:32 +0000 (-0700)
Subject: [parse] Use bb.which in resolve_file
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cd06ed487ee0617892f154cff461379a323a1fb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

[parse] Use bb.which in resolve_file

Signed-off-by: Chris Larson <clarson@kergoth.com>
---

diff --git a/lib/bb/parse/__init__.py b/lib/bb/parse/__init__.py
index 5e74afd9ac0..2a7897cdf27 100644
--- a/lib/bb/parse/__init__.py
+++ b/lib/bb/parse/__init__.py
@@ -82,13 +82,9 @@ def init(fn, data):
 
 def resolve_file(fn, d):
     if not os.path.isabs(fn):
-        bbpath = (bb.data.getVar('BBPATH', d, 1) or '').split(':')
-        for p in bbpath:
-            j = os.path.join(p, fn)
-            if os.access(j, os.R_OK):
-                bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % j)
-                return j
-        raise IOError("file %s not found" % fn)
+        fn = bb.which(bb.data.getVar("BBPATH", d, 1), fn)
+        if not fn:
+            raise IOError("file %s not found" % fn)
 
     bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % fn)
     return fn