diff options
author | Christopher Larson <chris_larson@mentor.com> | 2011-10-28 21:32:26 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:44:29 +0000 |
commit | ae96ac11897c1017aea359a8e3325291bc198293 (patch) | |
tree | 60ea01a4a0b04ee64c5eda99f5f1759f115dd4a6 /bitbake/lib/bb/data.py | |
parent | 48d7f5251bd5f3a44f713edfc297851258c57120 (diff) | |
download | poky-ae96ac11897c1017aea359a8e3325291bc198293.tar.gz |
codeparser: accept a name for better messages
- If a name is passed to the parser, prepend the messages with "while
parsing <name>:". 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 <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r-- | bitbake/lib/bb/data.py | 8 |
1 files changed, 4 insertions, 4 deletions
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()): | |||
258 | emit_var(key, o, d, False) and o.write('\n') | 258 | emit_var(key, o, d, False) and o.write('\n') |
259 | 259 | ||
260 | emit_var(func, o, d, False) and o.write('\n') | 260 | emit_var(func, o, d, False) and o.write('\n') |
261 | newdeps = bb.codeparser.ShellParser().parse_shell(d.getVar(func, True)) | 261 | newdeps = bb.codeparser.ShellParser(func).parse_shell(d.getVar(func, True)) |
262 | seen = set() | 262 | seen = set() |
263 | while newdeps: | 263 | while newdeps: |
264 | deps = newdeps | 264 | deps = newdeps |
@@ -267,7 +267,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): | |||
267 | for dep in deps: | 267 | for dep in deps: |
268 | if bb.data.getVarFlag(dep, "func", d): | 268 | if bb.data.getVarFlag(dep, "func", d): |
269 | emit_var(dep, o, d, False) and o.write('\n') | 269 | emit_var(dep, o, d, False) and o.write('\n') |
270 | newdeps |= bb.codeparser.ShellParser().parse_shell(d.getVar(dep, True)) | 270 | newdeps |= bb.codeparser.ShellParser(dep).parse_shell(d.getVar(dep, True)) |
271 | newdeps -= seen | 271 | newdeps -= seen |
272 | 272 | ||
273 | def update_data(d): | 273 | def update_data(d): |
@@ -280,12 +280,12 @@ def build_dependencies(key, keys, shelldeps, d): | |||
280 | if d.getVarFlag(key, "func"): | 280 | if d.getVarFlag(key, "func"): |
281 | if d.getVarFlag(key, "python"): | 281 | if d.getVarFlag(key, "python"): |
282 | parsedvar = d.expandWithRefs(d.getVar(key, False), key) | 282 | parsedvar = d.expandWithRefs(d.getVar(key, False), key) |
283 | parser = bb.codeparser.PythonParser() | 283 | parser = bb.codeparser.PythonParser(key) |
284 | parser.parse_python(parsedvar.value) | 284 | parser.parse_python(parsedvar.value) |
285 | deps = deps | parser.references | 285 | deps = deps | parser.references |
286 | else: | 286 | else: |
287 | parsedvar = d.expandWithRefs(d.getVar(key, False), key) | 287 | parsedvar = d.expandWithRefs(d.getVar(key, False), key) |
288 | parser = bb.codeparser.ShellParser() | 288 | parser = bb.codeparser.ShellParser(key) |
289 | parser.parse_shell(parsedvar.value) | 289 | parser.parse_shell(parsedvar.value) |
290 | deps = deps | shelldeps | 290 | deps = deps | shelldeps |
291 | deps = deps | parsedvar.references | 291 | deps = deps | parsedvar.references |