diff options
author | Holger Freyther <ich@tamarin.(none)> | 2009-05-19 09:46:42 +0200 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-12 17:59:15 +0000 |
commit | 0626614d44fcde8d42533da7586dea9930032638 (patch) | |
tree | 7a399cd9dc2daadaffd457d1336f42a6b0c9ab35 /lib/bb/parse/ast.py | |
parent | a3ebc01f30840d23b4afc62d80276dbf25ba783a (diff) | |
download | bitbake-0626614d44fcde8d42533da7586dea9930032638.tar.gz |
[parse] Change handling include through the AstNode
Disable the recursively evaluating the statement for now
as it is causing problems.
Diffstat (limited to 'lib/bb/parse/ast.py')
-rw-r--r-- | lib/bb/parse/ast.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index f587c6cbd..b9fb37c5f 100644 --- a/lib/bb/parse/ast.py +++ b/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 |