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/codeparser.py | |
parent | 48d7f5251bd5f3a44f713edfc297851258c57120 (diff) | |
download | openembedded-core-contrib-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/codeparser.py')
-rw-r--r-- | bitbake/lib/bb/codeparser.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py index 77156136f8..9a692a0c8e 100644 --- a/bitbake/lib/bb/codeparser.py +++ b/bitbake/lib/bb/codeparser.py @@ -155,8 +155,7 @@ class PythonParser(): expands = ("d.expand", "bb.data.expand", "data.expand") execfuncs = ("bb.build.exec_func", "bb.build.exec_task") - @classmethod - def warn(cls, func, arg): + def warn(self, func, arg): """Warn about calls of bitbake APIs which pass a non-literal argument for the variable name, as we're not able to track such a reference. @@ -168,8 +167,7 @@ class PythonParser(): except TypeError: logger.debug(2, 'Failed to convert function and argument to source form') else: - logger.debug(1, "Warning: in call to '%s', argument '%s' is " - "not a literal", funcstr, argstr) + logger.debug(1, self.unhandled_message % (funcstr, argstr)) def visit_Call(self, node): name = self.called_node_name(node.func) @@ -208,13 +206,16 @@ class PythonParser(): else: break - def __init__(self): + def __init__(self, name): self.var_references = set() self.var_execs = set() self.execs = set() self.var_expands = set() self.references = set() + self.unhandled_message = "in call of %s, argument '%s' is not a string literal" + self.unhandled_message = "while parsing %s, %s" % (name, self.unhandled_message) + def parse_python(self, node): h = hash(str(node)) @@ -238,10 +239,12 @@ class PythonParser(): pythonparsecache[h]["execs"] = self.execs class ShellParser(): - def __init__(self): + def __init__(self, name): self.funcdefs = set() self.allexecs = set() self.execs = set() + self.unhandled_template = "unable to handle non-literal command '%s'" + self.unhandled_template = "while parsing %s, %s" % (name, self.unhandled_template) def parse_shell(self, value): """Parse the supplied shell code in a string, returning the external @@ -356,8 +359,7 @@ class ShellParser(): cmd = word[1] if cmd.startswith("$"): - logger.debug(1, "Warning: execution of non-literal " - "command '%s'", cmd) + logger.debug(1, self.unhandled_template % cmd) elif cmd == "eval": command = " ".join(word for _, word in words[1:]) self.parse_shell(command) |