From ffaa0f1b8ab9460399b440ed295c8fed7c678993 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 4 Jun 2015 10:42:26 +0100 Subject: bitbake: parse/BBHandler: Avoid repeatedly resetting FILE If we're not going to change the value of FILE, or we know it isn't going to have changed (ext == bbclass), don't set FILE. This avoids messy looking history of the variable as well as optimises parsing speed slightly. (Bitbake rev: 88e4600aa66dda2e6c807f9d97af8982bcd8817b) Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/parse_py/BBHandler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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 85c27c24cc..03109dfbb2 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -148,7 +148,7 @@ def handle(fn, d, include): statements = get_statements(fn, abs_fn, base_name) # DONE WITH PARSING... time to evaluate - if ext != ".bbclass": + if ext != ".bbclass" and abs_fn != oldfile: d.setVar('FILE', abs_fn) try: @@ -166,7 +166,7 @@ def handle(fn, d, include): if ext != ".bbclass" and include == 0: return ast.multi_finalize(fn, d) - if oldfile: + if ext != ".bbclass" and oldfile and abs_fn != oldfile: d.setVar("FILE", oldfile) return d -- cgit v1.2.3-54-g00ecf