diff options
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 79b4ed9329..4be6614a2f 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
| @@ -484,10 +484,8 @@ class DataSmart(MutableMapping): | |||
| 484 | if '_' in var: | 484 | if '_' in var: |
| 485 | self._setvar_update_overrides(base, **loginfo) | 485 | self._setvar_update_overrides(base, **loginfo) |
| 486 | 486 | ||
| 487 | |||
| 488 | if base in self.overridevars: | 487 | if base in self.overridevars: |
| 489 | self.overridevars.update(self.expandWithRefs(value, var).references) | 488 | self._setvar_update_overridevars(var, value) |
| 490 | self.internal_finalize(True) | ||
| 491 | return | 489 | return |
| 492 | 490 | ||
| 493 | if not var in self.dict: | 491 | if not var in self.dict: |
| @@ -520,8 +518,11 @@ class DataSmart(MutableMapping): | |||
| 520 | self.varhistory.record(**loginfo) | 518 | self.varhistory.record(**loginfo) |
| 521 | 519 | ||
| 522 | if var in self.overridevars: | 520 | if var in self.overridevars: |
| 523 | self.overridevars.update(self.expandWithRefs(value, var).references) | 521 | self._setvar_update_overridevars(var, value) |
| 524 | self.internal_finalize(True) | 522 | |
| 523 | def _setvar_update_overridevars(self, var, value): | ||
| 524 | self.overridevars.update(self.expandWithRefs(value, var).references) | ||
| 525 | self.internal_finalize(True) | ||
| 525 | 526 | ||
| 526 | def _setvar_update_overrides(self, var, **loginfo): | 527 | def _setvar_update_overrides(self, var, **loginfo): |
| 527 | # aka pay the cookie monster | 528 | # aka pay the cookie monster |