diff options
| -rw-r--r-- | lib/bb/data_smart.py | 12 | ||||
| -rw-r--r-- | lib/bb/parse/ast.py | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 8f67227bd..301f9e372 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -267,12 +267,8 @@ class DataSmart(MutableMapping): # setting var self.dict[var]["content"] = value - def getVar(self, var, exp): - value = self.getVarFlag(var, "content") - - if exp and value: - return self.expand(value, var) - return value + def getVar(self, var, expand=False, noweakdefault=False): + return self.getVarFlag(var, "content", expand, noweakdefault) def renameVar(self, key, newkey): """ @@ -310,13 +306,13 @@ class DataSmart(MutableMapping): self._makeShadowCopy(var) self.dict[var][flag] = flagvalue - def getVarFlag(self, var, flag, expand=False): + def getVarFlag(self, var, flag, expand=False, noweakdefault=False): local_var = self._findVar(var) value = None if local_var: if flag in local_var: value = copy.copy(local_var[flag]) - elif flag == "content" and "defaultval" in local_var: + elif flag == "content" and "defaultval" in local_var and not noweakdefault: value = copy.copy(local_var["defaultval"]) if expand and value: value = self.expand(value, None) 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 |