From 7b57ad901af2ded02995d22718ec6f280a9edd7f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 19 May 2009 13:59:50 +0200 Subject: bitbake: [parser] Make resolve_file only resolve the path Do not attempt to open the file in the resolve_file method (a lot like bb.which... maybe bb.which can be used). This way we don't need to open/close a file which we have already parsed. Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/parse_py/BBHandler.py | 7 ++++--- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/bb/parse/parse_py') diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index ab479c1eb2..1ba81886a7 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 839a662024..deafd6479f 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) -- cgit v1.2.3-54-g00ecf