From d2bf3f00ea661794d2c6914fcb756a8e3d9a6039 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 19 May 2009 09:46:42 +0200 Subject: bitbake: [parse] Change handling include through the AstNode Disable the recursively evaluating the statement for now as it is causing problems. Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/ast.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'bitbake/lib/bb/parse') diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index f587c6cbd6..b9fb37c5fa 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py @@ -62,7 +62,7 @@ class IncludeNode: bb.parse.ConfHandler.include(statements, self.from_fn, s, data, "include required") else: bb.parse.ConfHandler.include(statements, self.from_fn, s, data, False) - statements.eval(data) + #statements.eval(data) class ExportNode: def __init__(self, var): @@ -120,13 +120,7 @@ class DataNode: def handleInclude(statements, m, fn, lineno, data, force): # AST handling statements.append(IncludeNode(m.group(1), fn, lineno, force)) - - s = bb.data.expand(m.group(1), data) - bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s)) - if force: - bb.parse.ConfHandler.include(statements, fn, s, data, "include required") - else: - bb.parse.ConfHandler.include(statements, fn, s, data, False) + statements[-1].eval(data) def handleExport(statements, m, data): # AST handling -- cgit v1.2.3-54-g00ecf