diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-21 11:31:32 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-21 13:00:57 +0100 |
commit | 011608a7b08c7fe5ad065da5179e1946ce250c57 (patch) | |
tree | 2fa9c4939a76b7856818e241767332810c04349e /bitbake/lib/bb | |
parent | 353212a5330040a24945fb7d10ae8b6a124355f6 (diff) | |
download | poky-011608a7b08c7fe5ad065da5179e1946ce250c57.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 17 |
1 files changed, 12 insertions, 5 deletions
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): | |||
485 | 485 | ||
486 | # more cookies for the cookie monster | 486 | # more cookies for the cookie monster |
487 | if '_' in var: | 487 | if '_' in var: |
488 | override = var[var.rfind('_')+1:] | 488 | self._setvar_update_overrides(var) |
489 | if len(override) > 0: | ||
490 | if override not in self._seen_overrides: | ||
491 | self._seen_overrides[override] = set() | ||
492 | self._seen_overrides[override].add( var ) | ||
493 | 489 | ||
494 | # setting var | 490 | # setting var |
495 | self.dict[var]["_content"] = value | 491 | self.dict[var]["_content"] = value |
496 | self.varhistory.record(**loginfo) | 492 | self.varhistory.record(**loginfo) |
497 | 493 | ||
494 | def _setvar_update_overrides(self, var): | ||
495 | # aka pay the cookie monster | ||
496 | override = var[var.rfind('_')+1:] | ||
497 | if len(override) > 0: | ||
498 | if override not in self._seen_overrides: | ||
499 | self._seen_overrides[override] = set() | ||
500 | self._seen_overrides[override].add( var ) | ||
501 | |||
498 | def getVar(self, var, expand=False, noweakdefault=False): | 502 | def getVar(self, var, expand=False, noweakdefault=False): |
499 | value = self.getVarFlag(var, "_content", False, noweakdefault) | 503 | value = self.getVarFlag(var, "_content", False, noweakdefault) |
500 | 504 | ||
@@ -566,6 +570,9 @@ class DataSmart(MutableMapping): | |||
566 | self._makeShadowCopy(var) | 570 | self._makeShadowCopy(var) |
567 | self.dict[var][flag] = value | 571 | self.dict[var][flag] = value |
568 | 572 | ||
573 | if flag == "defaultval" and '_' in var: | ||
574 | self._setvar_update_overrides(var) | ||
575 | |||
569 | def getVarFlag(self, var, flag, expand=False, noweakdefault=False): | 576 | def getVarFlag(self, var, flag, expand=False, noweakdefault=False): |
570 | local_var = self._findVar(var) | 577 | local_var = self._findVar(var) |
571 | value = None | 578 | value = None |