diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index ab479c1eb..1ba81886a 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -80,12 +80,13 @@ def inherit(files, d): include(fn, file, d, "inherit") __inherit_cache = data.getVar('__inherit_cache', d) or [] -def get_statements(filename, absolsute_filename, base_name, file): +def get_statements(filename, absolsute_filename, base_name): global cached_statements try: return cached_statements[absolsute_filename] except KeyError: + file = open(absolsute_filename, 'r') statements = ast.StatementGroup() lineno = 0 @@ -133,13 +134,13 @@ def handle(fn, d, include): else: oldfile = None - (f, abs_fn) = resolve_file(fn, d) + abs_fn = resolve_file(fn, d) if include: bb.parse.mark_dependency(d, abs_fn) # actual loading - statements = get_statements(fn, abs_fn, base_name, f) + statements = get_statements(fn, abs_fn, base_name) # DONE WITH PARSING... time to evaluate if ext != ".bbclass": diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 839a66202..deafd6479 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -84,7 +84,8 @@ def handle(fn, data, include): else: oldfile = bb.data.getVar('FILE', data) - (f, abs_fn) = resolve_file(fn, data) + abs_fn = resolve_file(fn, data) + f = open(abs_fn, 'r') if include: bb.parse.mark_dependency(data, abs_fn) |