summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-14 16:04:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-18 10:59:26 +0100
commit58530c6e481a2d237291af9e75d4417ecac7636b (patch)
tree2930ba72e8872372cdfd3702fa077e79d1fcbcca
parentc82410c5cca27ed85058a968c37eb566d687ec9b (diff)
downloadpoky-58530c6e481a2d237291af9e75d4417ecac7636b.tar.gz
bitbake: data_smart: Preserve history when renaming variables
Currently when a variable is renamed, all the variable history is lost. This makes it hard for users to understand/debug where values came from. Improve the code so that history is preserved across renamed variables. (Expanded variable key names are a special case of variable renaming) (Bitbake rev: 11722c989077a8751a5d0653c523760bf91e6efa) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/data_smart.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 7b09af5cf1..4434142a02 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -267,6 +267,16 @@ class VariableHistory(object):
267 return 267 return
268 self.variables[var].append(loginfo.copy()) 268 self.variables[var].append(loginfo.copy())
269 269
270 def rename_variable_hist(self, oldvar, newvar):
271 if not self.dataroot._tracking:
272 return
273 if oldvar not in self.variables:
274 return
275 if newvar not in self.variables:
276 self.variables[newvar] = []
277 for i in self.variables[oldvar]:
278 self.variables[newvar].append(i.copy())
279
270 def variable(self, var): 280 def variable(self, var):
271 remote_connector = self.dataroot.getVar('_remote_data', False) 281 remote_connector = self.dataroot.getVar('_remote_data', False)
272 if remote_connector: 282 if remote_connector:
@@ -619,6 +629,7 @@ class DataSmart(MutableMapping):
619 629
620 val = self.getVar(key, 0, parsing=True) 630 val = self.getVar(key, 0, parsing=True)
621 if val is not None: 631 if val is not None:
632 self.varhistory.rename_variable_hist(key, newkey)
622 loginfo['variable'] = newkey 633 loginfo['variable'] = newkey
623 loginfo['op'] = 'rename from %s' % key 634 loginfo['op'] = 'rename from %s' % key
624 loginfo['detail'] = val 635 loginfo['detail'] = val