summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-16 21:54:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-18 09:05:32 +0100
commit3165af39bf9690fba35d9dd78252eeadf656b229 (patch)
tree7af5e7018ee126431c4a99a7c882c8b12b77bd2e /bitbake/lib
parent07aef86c3a5fde8c335c6697ebbb751f79bbde1d (diff)
downloadpoky-3165af39bf9690fba35d9dd78252eeadf656b229.tar.gz
bitbake: data_smart: Separate out update_overridevars into separate function
No code changes, just refactoring to allow for functionality changes by moving things to a separate function. (Bitbake rev: 2eb934814179ccf42e3d424dabe26b17d013a7ed) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data_smart.py11
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