diff options
Diffstat (limited to 'bitbake/lib')
-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 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): | |||
82 | 82 | ||
83 | def resolve_file(fn, d): | 83 | def resolve_file(fn, d): |
84 | if not os.path.isabs(fn): | 84 | if not os.path.isabs(fn): |
85 | bbpath = (bb.data.getVar('BBPATH', d, 1) or '').split(':') | 85 | fn = bb.which(bb.data.getVar("BBPATH", d, 1), fn) |
86 | for p in bbpath: | 86 | if not fn: |
87 | j = os.path.join(p, fn) | 87 | raise IOError("file %s not found" % fn) |
88 | if os.access(j, os.R_OK): | ||
89 | bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % j) | ||
90 | return j | ||
91 | raise IOError("file %s not found" % fn) | ||
92 | 88 | ||
93 | bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % fn) | 89 | bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % fn) |
94 | return fn | 90 | return fn |