summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Avram <marius.avram@intel.com>2014-03-25 13:02:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-25 13:26:54 (GMT)
commit22af8031cdb3090330c5c4c965855963e24a3ba2 (patch)
tree39cc0002378dc4d07470ba6b7769f99665ecfb91
parent843e3ecf9e3f9292537446a2feccc1d2645ed231 (diff)
downloadpoky-22af8031cdb3090330c5c4c965855963e24a3ba2.tar.gz
bitbake: cooker: delVar in removeConfigurationVar
When a variable was removed from a configuration file it was not removed from memory. This also had the effect of not allowing to set a new value for the same variable with saveConfigurationVar. (Bitbake rev: 30cd1fab6633aaf50ef53eefccc6d69d598eb293) Signed-off-by: Marius Avram <marius.avram@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 07202e3..e4cff3a 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -334,6 +334,8 @@ class BBCooker:
334 contents[begin_line] = "\n" 334 contents[begin_line] = "\n"
335 #remove var from history 335 #remove var from history
336 self.data.varhistory.del_var_history(var, conf_file, line) 336 self.data.varhistory.del_var_history(var, conf_file, line)
337 #remove variable
338 self.data.delVar(var)
337 339
338 with open(conf_file, 'w') as f: 340 with open(conf_file, 'w') as f:
339 f.writelines(contents) 341 f.writelines(contents)