From f652b6b9d0db96d0fa2d2f1c732263140633d15f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Feb 2016 13:58:17 +0000 Subject: bitbake: data: Don't expand python functions for variable dependencies Expanding python functions for variable dependencies doesn't really make sense, not least since this causes execution of any inline python, it also makes it impossible to write expressions like d.expand("${X}") of d.setVar("X", "${Y}") which may have the wrong values if expanded now. This starts to standardise the approach across bitbake for handling python code. (Bitbake rev: 765a2480dbe288f64562a9611dd93b6b6dd0a64e) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 44f817e6c8..137ed4e3ee 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -362,27 +362,27 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): value = varflags.get("vardepvalue") elif varflags.get("func"): if varflags.get("python"): - parsedvar = d.expandWithRefs(value, key) parser = bb.codeparser.PythonParser(key, logger) - if parsedvar.value and "\t" in parsedvar.value: + if value and "\t" in value: logger.warn("Variable %s contains tabs, please remove these (%s)" % (key, d.getVar("FILE", True))) - parser.parse_python(parsedvar.value, filename=varflags.get("filename"), lineno=varflags.get("lineno")) + parser.parse_python(value, filename=varflags.get("filename"), lineno=varflags.get("lineno")) deps = deps | parser.references + deps = deps | (keys & parser.execs) value = handle_contains(value, parser.contains, d) else: parsedvar = d.expandWithRefs(value, key) parser = bb.codeparser.ShellParser(key, logger) parser.parse_shell(parsedvar.value) deps = deps | shelldeps + deps = deps | parsedvar.references + deps = deps | (keys & parser.execs) | (keys & parsedvar.execs) + value = handle_contains(value, parsedvar.contains, d) if vardeps is None: parser.log.flush() if "prefuncs" in varflags: deps = deps | set(varflags["prefuncs"].split()) if "postfuncs" in varflags: deps = deps | set(varflags["postfuncs"].split()) - deps = deps | parsedvar.references - deps = deps | (keys & parser.execs) | (keys & parsedvar.execs) - value = handle_contains(value, parsedvar.contains, d) else: parser = d.expandWithRefs(value, key) deps |= parser.references -- cgit v1.2.3-54-g00ecf