summaryrefslogtreecommitdiffstats
path: root/lib/bb/parse/parse_py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 09:45:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-15 22:50:52 +0000
commit2568e9ace6e6f483e1bf2a9ef2f4d8318d6c85b7 (patch)
tree2645e95e996769b1043c4e91f376ca538f4f4470 /lib/bb/parse/parse_py
parent17e68cfc6018b93d19738a6a874dfdea23fbab11 (diff)
downloadbitbake-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/parse_py')
-rw-r--r--lib/bb/parse/parse_py/BBHandler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py
index 125f458de..815bce1d7 100644
--- a/lib/bb/parse/parse_py/BBHandler.py
+++ b/lib/bb/parse/parse_py/BBHandler.py
@@ -70,8 +70,8 @@ def supports(fn, d):
def inherit(files, fn, lineno, d):
__inherit_cache = data.getVar('__inherit_cache', d) or []
+ files = d.expand(files).split()
for file in files:
- file = data.expand(file, d)
if not os.path.isabs(file) and not file.endswith(".bbclass"):
file = os.path.join('classes', '%s.bbclass' % file)