From a4bb753488d322e0e31c31d6377ba780f2f824c4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 4 Jan 2016 17:31:58 +0000 Subject: data: Pass lineno/filename data from build_dependencies If parse_python() fails, the output is confusing. Passing in the extra file/line data isn't expensive and improves readability significantly. Signed-off-by: Richard Purdie --- lib/bb/data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/bb/data.py') diff --git a/lib/bb/data.py b/lib/bb/data.py index f6415a4674..dc8d02e01d 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -338,7 +338,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): deps |= parser.references deps = deps | (keys & parser.execs) return deps, value - varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "vardepvalueexclude", "postfuncs", "prefuncs"]) or {} + varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "vardepvalueexclude", "postfuncs", "prefuncs", "lineno", "filename"]) or {} vardeps = varflags.get("vardeps") value = d.getVar(key, False) @@ -365,7 +365,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): parser = bb.codeparser.PythonParser(key, logger) if parsedvar.value and "\t" in parsedvar.value: logger.warn("Variable %s contains tabs, please remove these (%s)" % (key, d.getVar("FILE", True))) - parser.parse_python(parsedvar.value) + parser.parse_python(parsedvar.value, filename=varflags.get("filename"), lineno=varflags.get("lineno")) deps = deps | parser.references value = handle_contains(value, parser.contains, d) else: -- cgit 1.2.3-korg