summaryrefslogtreecommitdiffstats
path: root/bitbake/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:56:16 +0000
commitd3d9a37aa7addac066762f624ec857d34c57343b (patch)
tree7869778847e8e4649366d313dc0623e4ebe0101e /bitbake/lib/bb/parse/parse_py
parentb1256965bb0d5e97862b5bcddc5864a491794741 (diff)
downloadpoky-d3d9a37aa7addac066762f624ec857d34c57343b.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". (Bitbake rev: 2568e9ace6e6f483e1bf2a9ef2f4d8318d6c85b7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 125f458de7..815bce1d75 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -70,8 +70,8 @@ def supports(fn, d):
70 70
71def inherit(files, fn, lineno, d): 71def inherit(files, fn, lineno, d):
72 __inherit_cache = data.getVar('__inherit_cache', d) or [] 72 __inherit_cache = data.getVar('__inherit_cache', d) or []
73 files = d.expand(files).split()
73 for file in files: 74 for file in files:
74 file = data.expand(file, d)
75 if not os.path.isabs(file) and not file.endswith(".bbclass"): 75 if not os.path.isabs(file) and not file.endswith(".bbclass"):
76 file = os.path.join('classes', '%s.bbclass' % file) 76 file = os.path.join('classes', '%s.bbclass' % file)
77 77