From d3d9a37aa7addac066762f624ec857d34c57343b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 09:45:58 +0000 Subject: 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 --- bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py') 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): 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) -- cgit v1.2.3-54-g00ecf