From c675bfd5bfb6719187d18e1646e499a4c346193c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 18 Jul 2009 22:36:32 -0700 Subject: bitbake: [parse] Use bb.which in resolve_file (Bitbake rev: 3cd06ed487ee0617892f154cff461379a323a1fb) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/__init__.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 5e74afd9ac..2a7897cdf2 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/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 -- cgit v1.2.3