summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-07-01 08:09:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-03 08:13:35 +0100
commit8a186a6b3853fc1a7dcf342d421c8926c38949c9 (patch)
tree03a90f2b0b34496d7f727f2cc50e9c6ed30c258c /bitbake/lib
parenteaa5df34af42b6a37f6506847d0f3ef6ba0d298a (diff)
downloadpoky-8a186a6b3853fc1a7dcf342d421c8926c38949c9.tar.gz
bitbake: hob: save button from settings called a nonexisting method
The method was removed when the process for saving configuration in Hob was changed. Replace the call with the right function. [YOCTO #4793] (Bitbake rev: b6aa2b63d71cbe82850a375381b2dbc750cf1905) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py6
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index d5df60f602..8571014afc 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -191,7 +191,7 @@ class Configuration:
191 self.split_proxy("socks", params["socks_proxy"]) 191 self.split_proxy("socks", params["socks_proxy"])
192 self.split_proxy("cvs", params["cvs_proxy_host"] + ":" + params["cvs_proxy_port"]) 192 self.split_proxy("cvs", params["cvs_proxy_host"] + ":" + params["cvs_proxy_port"])
193 193
194 def save(self, handler, template, defaults=False): 194 def save(self, handler, defaults=False):
195 # bblayers.conf 195 # bblayers.conf
196 handler.set_var_in_file("BBLAYERS", self.layers, "bblayers.conf") 196 handler.set_var_in_file("BBLAYERS", self.layers, "bblayers.conf")
197 # local.conf 197 # local.conf
@@ -1229,7 +1229,7 @@ class Builder(gtk.Window):
1229 settings_changed = False 1229 settings_changed = False
1230 if response == gtk.RESPONSE_YES: 1230 if response == gtk.RESPONSE_YES:
1231 self.configuration = dialog.configuration 1231 self.configuration = dialog.configuration
1232 self.save_defaults() # remember settings 1232 self.configuration.save(self.handler, True) # remember settings
1233 settings_changed = dialog.settings_changed 1233 settings_changed = dialog.settings_changed
1234 dialog.destroy() 1234 dialog.destroy()
1235 return response == gtk.RESPONSE_YES, settings_changed 1235 return response == gtk.RESPONSE_YES, settings_changed
@@ -1257,7 +1257,7 @@ class Builder(gtk.Window):
1257 settings_changed = False 1257 settings_changed = False
1258 if response == gtk.RESPONSE_YES: 1258 if response == gtk.RESPONSE_YES:
1259 self.configuration = dialog.configuration 1259 self.configuration = dialog.configuration
1260 self.save_defaults() # remember settings 1260 self.configuration.save(self.handler, True) # remember settings
1261 settings_changed = dialog.settings_changed 1261 settings_changed = dialog.settings_changed
1262 if dialog.proxy_settings_changed: 1262 if dialog.proxy_settings_changed:
1263 self.set_user_config_proxies() 1263 self.set_user_config_proxies()
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 1b9596f9b0..8788083d5c 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -146,7 +146,9 @@ class HobHandler(gobject.GObject):
146 elif next_command == self.SUB_MATCH_CLASS: 146 elif next_command == self.SUB_MATCH_CLASS:
147 self.runCommand(["findFilesMatchingInDir", "rootfs_", "classes"]) 147 self.runCommand(["findFilesMatchingInDir", "rootfs_", "classes"])
148 elif next_command == self.SUB_PARSE_CONFIG: 148 elif next_command == self.SUB_PARSE_CONFIG:
149 self.runCommand(["enableDataTracking"])
149 self.runCommand(["parseConfigurationFiles", "conf/.hob.conf", ""]) 150 self.runCommand(["parseConfigurationFiles", "conf/.hob.conf", ""])
151 self.runCommand(["disableDataTracking"])
150 elif next_command == self.SUB_GNERATE_TGTS: 152 elif next_command == self.SUB_GNERATE_TGTS:
151 self.runCommand(["generateTargetsTree", "classes/image.bbclass", []]) 153 self.runCommand(["generateTargetsTree", "classes/image.bbclass", []])
152 elif next_command == self.SUB_GENERATE_PKGINFO: 154 elif next_command == self.SUB_GENERATE_PKGINFO: