summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data_smart.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index bc359de4f1..8f67227bd6 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -178,7 +178,6 @@ class DataSmart(MutableMapping):
178 try: 178 try:
179 self.setVar(name, self.getVar(var, False)) 179 self.setVar(name, self.getVar(var, False))
180 self.delVar(var) 180 self.delVar(var)
181 self._seen_overrides[o].remove(var)
182 except Exception: 181 except Exception:
183 logger.info("Untracked delVar") 182 logger.info("Untracked delVar")
184 183
@@ -301,6 +300,10 @@ class DataSmart(MutableMapping):
301 def delVar(self, var): 300 def delVar(self, var):
302 self.expand_cache = {} 301 self.expand_cache = {}
303 self.dict[var] = {} 302 self.dict[var] = {}
303 if '_' in var:
304 override = var[var.rfind('_')+1:]
305 if override and override in self._seen_overrides and var in self._seen_overrides[override]:
306 self._seen_overrides[override].remove(var)
304 307
305 def setVarFlag(self, var, flag, flagvalue): 308 def setVarFlag(self, var, flag, flagvalue):
306 if not var in self.dict: 309 if not var in self.dict: