diff options
Diffstat (limited to 'bitbake/lib/bb/parse/__init__.py')
-rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 6737e061ea..5e74afd9ac 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py | |||
@@ -82,22 +82,16 @@ 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 | f = None | ||
86 | bbpath = (bb.data.getVar('BBPATH', d, 1) or '').split(':') | 85 | bbpath = (bb.data.getVar('BBPATH', d, 1) or '').split(':') |
87 | for p in bbpath: | 86 | for p in bbpath: |
88 | j = os.path.join(p, fn) | 87 | j = os.path.join(p, fn) |
89 | if os.access(j, os.R_OK): | 88 | if os.access(j, os.R_OK): |
90 | abs_fn = j | 89 | bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % j) |
91 | f = open(j, 'r') | 90 | return j |
92 | break | 91 | raise IOError("file %s not found" % fn) |
93 | if f is None: | 92 | |
94 | raise IOError("file %s not found" % fn) | 93 | bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % fn) |
95 | else: | 94 | return fn |
96 | f = open(fn,'r') | ||
97 | abs_fn = fn | ||
98 | |||
99 | bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % abs_fn) | ||
100 | return (f, abs_fn) | ||
101 | 95 | ||
102 | # Used by OpenEmbedded metadata | 96 | # Used by OpenEmbedded metadata |
103 | __pkgsplit_cache__={} | 97 | __pkgsplit_cache__={} |