From 58530c6e481a2d237291af9e75d4417ecac7636b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Oct 2018 16:04:35 +0100 Subject: 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 --- bitbake/lib/bb/data_smart.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'bitbake') 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): return self.variables[var].append(loginfo.copy()) + def rename_variable_hist(self, oldvar, newvar): + if not self.dataroot._tracking: + return + if oldvar not in self.variables: + return + if newvar not in self.variables: + self.variables[newvar] = [] + for i in self.variables[oldvar]: + self.variables[newvar].append(i.copy()) + def variable(self, var): remote_connector = self.dataroot.getVar('_remote_data', False) if remote_connector: @@ -619,6 +629,7 @@ class DataSmart(MutableMapping): val = self.getVar(key, 0, parsing=True) if val is not None: + self.varhistory.rename_variable_hist(key, newkey) loginfo['variable'] = newkey loginfo['op'] = 'rename from %s' % key loginfo['detail'] = val -- cgit v1.2.3-54-g00ecf