diff options
| author |   Jacob Kroon <jacob.kroon@mikrodidakt.se> | 2014-02-22 17:52:29 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-24 11:41:47 +0000 |
| commit | 537f1f9bbe110acc9848ef95f43468c07d87af79 (patch) | |
| tree | 3cee164aea312a65182b17464fcee15bbbe08122 /lib/bb/parse/ast.py | |
| parent | c39b99792547b642570ea5152070e7396e812390 (diff) | |
| download | bitbake-537f1f9bbe110acc9848ef95f43468c07d87af79.tar.gz | |
ast: Fix support for anonymous methods in wildcard .bbappend files
When using wildcard .bbappend files with anonymous methods in them,
bitbake/python fails to parse the generated code since the '%' is encoded
in the generated method name.
Fix this by including '%' in the convert-to-underscore list during
method name mangling.
While we're at it, move the method name mangling translation table
to a class variable, as suggested by Chris Larson.
[YOCTO #5864]
Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/parse/ast.py')
| -rw-r--r-- | lib/bb/parse/ast.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index a2020532e..d8c141b37 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -139,6 +139,8 @@ class DataNode(AstNode): data.setVar(key, val, **loginfo) class MethodNode(AstNode): + tr_tbl = string.maketrans('/.+-@%', '______') + def __init__(self, filename, lineno, func_name, body): AstNode.__init__(self, filename, lineno) self.func_name = func_name @@ -147,7 +149,7 @@ class MethodNode(AstNode): def eval(self, data): text = '\n'.join(self.body) if self.func_name == "__anonymous": - funcname = ("__anon_%s_%s" % (self.lineno, self.filename.translate(string.maketrans('/.+-@', '_____')))) + funcname = ("__anon_%s_%s" % (self.lineno, self.filename.translate(MethodNode.tr_tbl))) text = "def %s(d):\n" % (funcname) + text bb.methodpool.insert_method(funcname, text, self.filename) anonfuncs = data.getVar('__BBANONFUNCS') or [] |