diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 09:45:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-15 22:50:52 +0000 |
commit | 2568e9ace6e6f483e1bf2a9ef2f4d8318d6c85b7 (patch) | |
tree | 2645e95e996769b1043c4e91f376ca538f4f4470 /lib/bb/parse/ast.py | |
parent | 17e68cfc6018b93d19738a6a874dfdea23fbab11 (diff) | |
download | openembedded-core-contrib-2568e9ace6e6f483e1bf2a9ef2f4d8318d6c85b7.tar.gz |
parse/ast: Expand inherit statements before splitting them
This means that statements that expand to more then one entry
such as:
CLASSES = "a b"
inherit ${CLASSES}
work correctly instead of trying to inherit a class called "a b".
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, 2 insertions, 2 deletions
diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index 7cef3d0373..eae840fa8d 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -304,7 +304,7 @@ def handleBBHandlers(statements, filename, lineno, m): def handleInherit(statements, filename, lineno, m): classes = m.group(1) - statements.append(InheritNode(filename, lineno, classes.split())) + statements.append(InheritNode(filename, lineno, classes)) def finalize(fn, d, variant = None): all_handlers = {} @@ -452,7 +452,7 @@ def multi_finalize(fn, d): d.setVar("BBEXTENDVARIANT", variantmap[name]) else: d.setVar("PN", "%s-%s" % (pn, name)) - bb.parse.BBHandler.inherit([extendedmap[name]], fn, 0, d) + bb.parse.BBHandler.inherit(extendedmap[name], fn, 0, d) safe_d.setVar("BBCLASSEXTEND", extended) _create_variants(datastores, extendedmap.keys(), extendfunc) |