diff options
| author |   Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-01 20:14:09 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-05 14:00:26 +0100 |
| commit | c77321180bcf30827e5d81026e03db9af56d4464 (patch) | |
| tree | 3080040c1b93afc7d059778c51f69b1bc1ee31b0 /bitbake | |
| parent | 5607729d9901c394b7cd4db6e38fe7fb19116f39 (diff) | |
| download | openembedded-core-contrib-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')
| -rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 3 |
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): response = dialog.run() dialog.destroy() self.handler.clear_busy() - self.configuration.curr_mach = None + self.configuration.curr_mach = "" self.image_configuration_page.switch_machine_combo() self.switch_page(self.MACHINE_SELECTION) @@ -868,7 +868,7 @@ class Builder(gtk.Window): def reparse_post_adv_settings(self): # DO reparse recipes - if self.configuration.curr_mach == "": + if not self.configuration.curr_mach: self.switch_page(self.MACHINE_SELECTION) else: 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): self.server.runCommand(["setVariable", "BBLAYERS", " ".join(bblayers)]) def set_machine(self, machine): - self.server.runCommand(["setVariable", "MACHINE", machine]) + if machine: + self.server.runCommand(["setVariable", "MACHINE", machine]) def set_sdk_machine(self, sdk_machine): self.server.runCommand(["setVariable", "SDKMACHINE", sdk_machine]) |