diff options
| author | Chris Larson <clarson@kergoth.com> | 2009-07-18 22:36:32 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-15 17:07:56 +0000 |
| commit | c675bfd5bfb6719187d18e1646e499a4c346193c (patch) | |
| tree | ce1b3081206885d1789a6d6295aaa55943efef2b /bitbake/lib/bb/parse | |
| parent | 7b57ad901af2ded02995d22718ec6f280a9edd7f (diff) | |
| download | openembedded-core-c675bfd5bfb6719187d18e1646e499a4c346193c.tar.gz openembedded-core-c675bfd5bfb6719187d18e1646e499a4c346193c.tar.bz2 openembedded-core-c675bfd5bfb6719187d18e1646e499a4c346193c.tar.xz openembedded-core-c675bfd5bfb6719187d18e1646e499a4c346193c.zip | |
bitbake: [parse] Use bb.which in resolve_file
(Bitbake rev: 3cd06ed487ee0617892f154cff461379a323a1fb)
Signed-off-by: Chris Larson <clarson@kergoth.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse')
| -rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 5e74afd9a..2a7897cdf 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 |