parse/ast: Expand inherit statements before splitting them

PATCH In review Richard Purdie 2 participants 3 messages Mar 4, 2012 – Mar 8, 2012

lore

Share & tools

lore

Richard Purdie

author

2012-03-04 04:25 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 bitbake/lib/bb/cooker.py                   |    2 +-
 bitbake/lib/bb/parse/ast.py                |    4 ++--
 bitbake/lib/bb/parse/parse_py/BBHandler.py |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

bitbake/lib/bb/cooker.py +1 -1

index 558eadd..d6e1bf8 100644
@@ -1431,7 +1431,7 @@ def _parse(fn, data, include=True):
 
 @catch_parse_error
 def _inherit(bbclass, data):
-    bb.parse.BBHandler.inherit([bbclass], "configuration INHERITs", 0, data)
+    bb.parse.BBHandler.inherit(bbclass, "configuration INHERITs", 0, data)
     return data
 
 class ParsingFailure(Exception):

bitbake/lib/bb/parse/ast.py +2 -2

index 7cef3d0..eae840f 100644
@@ -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)

bitbake/lib/bb/parse/parse_py/BBHandler.py +1 -1

index 125f458..815bce1 100644
@@ -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)

McClintock Matthew-B29882

2012-03-07 23:07 UTC #1 lore raw

Quoted 7 lines · Richard Purdie

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".

Does this effect:

CLASSES = ""

inherit a ${CLASSES}

-M

Richard Purdie

author

2012-03-08 15:11 UTC #2 lore raw

Quoted 8 lines · On Wed, 2012-03-07 at 22:13 +0000, McClintock Matthew-B29882 wrote:

Quoted 6 lines · Richard Purdie
This means that statements that expand to more then one entry such as:
CLASSES = "a b"
inherit ${CLASSES}

Quoted 7 lines

Quoted 1 line
work correctly instead of trying to inherit a class called "a b".
Does this effect:
CLASSES = ""
inherit a ${CLASSES}

Possibly in that if it didn't work before, it perhaps does now. I certainly can't see the change making this any less functional.

Cheers,

Richard