summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-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])