diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 11:02:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 11:02:04 +0100 |
commit | 32fee2e650dfdd3aa9a7572dad1251e0c24ca34b (patch) | |
tree | 221f10bb5c0fb39470ea7c6250b43c32a2bc5af1 /lib/bb/parse/ast.py | |
parent | a8246ae5400c23df0d3ee29c36f4d9f257d1e6d1 (diff) | |
download | bitbake-32fee2e650dfdd3aa9a7572dad1251e0c24ca34b.tar.gz |
bitbake/ast: Fix ??= vs. ?= handling
As the code stands, setting a variable with ??= could result in a ?=
variable not overriding it. This patch fixes the issue by allowing
the ast to make lookups that ignore any ??= set variables.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/parse/ast.py')
-rw-r--r-- | lib/bb/parse/ast.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index e41bb74f4..2301abd12 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -84,9 +84,9 @@ class DataNode(AstNode): def getFunc(self, key, data): if 'flag' in self.groupd and self.groupd['flag'] != None: - return bb.data.getVarFlag(key, self.groupd['flag'], data) + return data.getVarFlag(key, self.groupd['flag'], noweakdefault=True) else: - return bb.data.getVar(key, data) + return data.getVar(key, noweakdefault=True) def eval(self, data): groupd = self.groupd |