From ae96ac11897c1017aea359a8e3325291bc198293 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 28 Oct 2011 21:32:26 -0400 Subject: codeparser: accept a name for better messages - If a name is passed to the parser, prepend the messages with "while parsing :". This gives a bit more context. - Tweak the warning messages slightly (they had to be altered anyway to inject the variable being parsed). Before: DEBUG: Warning: in call to 'bb.data.getVar': argument ''%s' % var' is \ not a literal After: DEBUG: while parsing emit_pkgdata, in call of bb.data.getVar, argument \ ''%s' % var' is not a string literal (Bitbake rev: 1060193ae4d54e667735dbff5d1d2be49a3f95c9) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/bb/data.py') diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index ac0d8809cc..bcb8b055b8 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -258,7 +258,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): emit_var(key, o, d, False) and o.write('\n') emit_var(func, o, d, False) and o.write('\n') - newdeps = bb.codeparser.ShellParser().parse_shell(d.getVar(func, True)) + newdeps = bb.codeparser.ShellParser(func).parse_shell(d.getVar(func, True)) seen = set() while newdeps: deps = newdeps @@ -267,7 +267,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): for dep in deps: if bb.data.getVarFlag(dep, "func", d): emit_var(dep, o, d, False) and o.write('\n') - newdeps |= bb.codeparser.ShellParser().parse_shell(d.getVar(dep, True)) + newdeps |= bb.codeparser.ShellParser(dep).parse_shell(d.getVar(dep, True)) newdeps -= seen def update_data(d): @@ -280,12 +280,12 @@ def build_dependencies(key, keys, shelldeps, d): if d.getVarFlag(key, "func"): if d.getVarFlag(key, "python"): parsedvar = d.expandWithRefs(d.getVar(key, False), key) - parser = bb.codeparser.PythonParser() + parser = bb.codeparser.PythonParser(key) parser.parse_python(parsedvar.value) deps = deps | parser.references else: parsedvar = d.expandWithRefs(d.getVar(key, False), key) - parser = bb.codeparser.ShellParser() + parser = bb.codeparser.ShellParser(key) parser.parse_shell(parsedvar.value) deps = deps | shelldeps deps = deps | parsedvar.references -- cgit v1.2.3-54-g00ecf