summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-04-01 20:14:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-05 14:00:26 +0100
commitc77321180bcf30827e5d81026e03db9af56d4464 (patch)
tree3080040c1b93afc7d059778c51f69b1bc1ee31b0 /bitbake/lib/bb/ui
parent5607729d9901c394b7cd4db6e38fe7fb19116f39 (diff)
downloadpoky-c77321180bcf30827e5d81026e03db9af56d4464.tar.gz
Hob: Fix MACHINE setting
Define the empty curr_mach to be "" instead of None. Fix the judgement for ' if self.curr_mach == "" ' to be ' if self.curr_mach '. Also set machine to bitbake server when "MACHINE" is not empty. (Bitbake rev: 662fa1b126d5b9b3a80193205c22b2fe29305185) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py4
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index c1a75bde1a..02c9a9cb49 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -519,7 +519,7 @@ class Builder(gtk.Window):
519 response = dialog.run() 519 response = dialog.run()
520 dialog.destroy() 520 dialog.destroy()
521 self.handler.clear_busy() 521 self.handler.clear_busy()
522 self.configuration.curr_mach = None 522 self.configuration.curr_mach = ""
523 self.image_configuration_page.switch_machine_combo() 523 self.image_configuration_page.switch_machine_combo()
524 self.switch_page(self.MACHINE_SELECTION) 524 self.switch_page(self.MACHINE_SELECTION)
525 525
@@ -868,7 +868,7 @@ class Builder(gtk.Window):
868 868
869 def reparse_post_adv_settings(self): 869 def reparse_post_adv_settings(self):
870 # DO reparse recipes 870 # DO reparse recipes
871 if self.configuration.curr_mach == "": 871 if not self.configuration.curr_mach:
872 self.switch_page(self.MACHINE_SELECTION) 872 self.switch_page(self.MACHINE_SELECTION)
873 else: 873 else:
874 self.switch_page(self.RCPPKGINFO_POPULATING) 874 self.switch_page(self.RCPPKGINFO_POPULATING)
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index a329380af3..3d5df9e6e6 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -256,7 +256,8 @@ class HobHandler(gobject.GObject):
256 self.server.runCommand(["setVariable", "BBLAYERS", " ".join(bblayers)]) 256 self.server.runCommand(["setVariable", "BBLAYERS", " ".join(bblayers)])
257 257
258 def set_machine(self, machine): 258 def set_machine(self, machine):
259 self.server.runCommand(["setVariable", "MACHINE", machine]) 259 if machine:
260 self.server.runCommand(["setVariable", "MACHINE", machine])
260 261
261 def set_sdk_machine(self, sdk_machine): 262 def set_sdk_machine(self, sdk_machine):
262 self.server.runCommand(["setVariable", "SDKMACHINE", sdk_machine]) 263 self.server.runCommand(["setVariable", "SDKMACHINE", sdk_machine])