From 8a186a6b3853fc1a7dcf342d421c8926c38949c9 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Mon, 1 Jul 2013 08:09:52 +0000 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 6 +++--- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'bitbake') 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: self.split_proxy("socks", params["socks_proxy"]) self.split_proxy("cvs", params["cvs_proxy_host"] + ":" + params["cvs_proxy_port"]) - def save(self, handler, template, defaults=False): + def save(self, handler, defaults=False): # bblayers.conf handler.set_var_in_file("BBLAYERS", self.layers, "bblayers.conf") # local.conf @@ -1229,7 +1229,7 @@ class Builder(gtk.Window): settings_changed = False if response == gtk.RESPONSE_YES: self.configuration = dialog.configuration - self.save_defaults() # remember settings + self.configuration.save(self.handler, True) # remember settings settings_changed = dialog.settings_changed dialog.destroy() return response == gtk.RESPONSE_YES, settings_changed @@ -1257,7 +1257,7 @@ class Builder(gtk.Window): settings_changed = False if response == gtk.RESPONSE_YES: self.configuration = dialog.configuration - self.save_defaults() # remember settings + self.configuration.save(self.handler, True) # remember settings settings_changed = dialog.settings_changed if dialog.proxy_settings_changed: 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): elif next_command == self.SUB_MATCH_CLASS: self.runCommand(["findFilesMatchingInDir", "rootfs_", "classes"]) elif next_command == self.SUB_PARSE_CONFIG: + self.runCommand(["enableDataTracking"]) self.runCommand(["parseConfigurationFiles", "conf/.hob.conf", ""]) + self.runCommand(["disableDataTracking"]) elif next_command == self.SUB_GNERATE_TGTS: self.runCommand(["generateTargetsTree", "classes/image.bbclass", []]) elif next_command == self.SUB_GENERATE_PKGINFO: -- cgit v1.2.3-54-g00ecf