summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2011-10-28 23:06:18 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:44:29 +0000
commit7e436a98454275bea71cb511d13ad3665a1caba9 (patch)
treeb6d7b1576a8d8010353c7f5041d77283e0d348d0
parentae96ac11897c1017aea359a8e3325291bc198293 (diff)
downloadast2050-yocto-poky-7e436a98454275bea71cb511d13ad3665a1caba9.zip
ast2050-yocto-poky-7e436a98454275bea71cb511d13ad3665a1caba9.tar.gz
codeparser: drop expand tracking
There are two usual cases involving bb.data.expand: - Calling it with a string literal -- "bb.data.expand('${FOO}/${BAZ}/bleh', d)". - Calling it on getVar results (legacy) -- "bb.data.expand(bb.data.getVar('FOO', d), d)" Nothing in any of the usual layers uses it in any other way, and I'm having trouble coming up with any real use cases beyond this. The first of the above cases is already tracked, via the expandWithRefs called on the python code string. The second didn't emit a warning anyway, since the getVar was already handled. Given this, I see no reason for us to maintain explicit expansion tracking. Further, we weren't using its results anyway (the var_expands member). (Bitbake rev: 405dfe69e6a608826e599ebf2f83ef8cf5083b96) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/codeparser.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py
index 9a692a0..615fb7d 100644
--- a/bitbake/lib/bb/codeparser.py
+++ b/bitbake/lib/bb/codeparser.py
@@ -152,7 +152,6 @@ def parser_cache_savemerge(d):
class PythonParser():
getvars = ("d.getVar", "bb.data.getVar", "data.getVar")
- expands = ("d.expand", "bb.data.expand", "data.expand")
execfuncs = ("bb.build.exec_func", "bb.build.exec_task")
def warn(self, func, arg):
@@ -176,15 +175,6 @@ class PythonParser():
self.var_references.add(node.args[0].s)
else:
self.warn(node.func, node.args[0])
- elif name in self.expands:
- if isinstance(node.args[0], ast.Str):
- self.warn(node.func, node.args[0])
- self.var_expands.add(node.args[0].s)
- elif isinstance(node.args[0], ast.Call) and \
- self.called_node_name(node.args[0].func) in self.getvars:
- pass
- else:
- self.warn(node.func, node.args[0])
elif name in self.execfuncs:
if isinstance(node.args[0], ast.Str):
self.var_execs.add(node.args[0].s)
@@ -210,7 +200,6 @@ class PythonParser():
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"
OpenPOWER on IntegriCloud