From 011608a7b08c7fe5ad065da5179e1946ce250c57 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jun 2013 11:31:32 +0000 Subject: bitbake: data_smart: Fix bug with overrides and weak default values (aka pay the cookie monster for weak defaults) If you have code like: MYVAR = "a" MYVAR_override ??= "b" then MYVAR will get the value "a" even when override is in OVERRIDES. The reason is that the value of ??= is set as a flag not a value and the cookie monster isn't paid. The fix is to ensure appropriate payment is made for a defaultval varflag matching the usual setVar case. (Bitbake rev: 3d8044bc79c482c5ea008ddf12a8128dcd1527ee) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index fa7811e6f4..dfa9afe461 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -485,16 +485,20 @@ class DataSmart(MutableMapping): # more cookies for the cookie monster if '_' in var: - override = var[var.rfind('_')+1:] - if len(override) > 0: - if override not in self._seen_overrides: - self._seen_overrides[override] = set() - self._seen_overrides[override].add( var ) + self._setvar_update_overrides(var) # setting var self.dict[var]["_content"] = value self.varhistory.record(**loginfo) + def _setvar_update_overrides(self, var): + # aka pay the cookie monster + override = var[var.rfind('_')+1:] + if len(override) > 0: + if override not in self._seen_overrides: + self._seen_overrides[override] = set() + self._seen_overrides[override].add( var ) + def getVar(self, var, expand=False, noweakdefault=False): value = self.getVarFlag(var, "_content", False, noweakdefault) @@ -566,6 +570,9 @@ class DataSmart(MutableMapping): self._makeShadowCopy(var) self.dict[var][flag] = value + if flag == "defaultval" and '_' in var: + self._setvar_update_overrides(var) + def getVarFlag(self, var, flag, expand=False, noweakdefault=False): local_var = self._findVar(var) value = None -- cgit v1.2.3-54-g00ecf