summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 11:02:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 11:39:05 +0100
commit56e46f0bc41013f6857fdb85c82c0ebf75d822f9 (patch)
tree76e9b0856abf5941d7d47217d10b4fd0a1783337 /bitbake/lib/bb/parse
parentc6dac094ac79f6eae6998527e025417e16b46eed (diff)
downloadpoky-56e46f0bc41013f6857fdb85c82c0ebf75d822f9.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. (Bitbake rev: 32fee2e650dfdd3aa9a7572dad1251e0c24ca34b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r--bitbake/lib/bb/parse/ast.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index e41bb74f40..2301abd12b 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -84,9 +84,9 @@ class DataNode(AstNode):
84 84
85 def getFunc(self, key, data): 85 def getFunc(self, key, data):
86 if 'flag' in self.groupd and self.groupd['flag'] != None: 86 if 'flag' in self.groupd and self.groupd['flag'] != None:
87 return bb.data.getVarFlag(key, self.groupd['flag'], data) 87 return data.getVarFlag(key, self.groupd['flag'], noweakdefault=True)
88 else: 88 else:
89 return bb.data.getVar(key, data) 89 return data.getVar(key, noweakdefault=True)
90 90
91 def eval(self, data): 91 def eval(self, data):
92 groupd = self.groupd 92 groupd = self.groupd