summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-04-09 14:13:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-10 23:05:22 (GMT)
commit59cd6a56e3bc44e37560e774f237e8f6d1cc4050 (patch)
treef286f68db28aacba375211992f9fc1b0eb5db245
parent62e5a4df09fb8d244bc4d9aac0f1e6af6e692b32 (diff)
downloadpoky-59cd6a56e3bc44e37560e774f237e8f6d1cc4050.tar.gz
Hob: clean up and reword stop_parse()
(Bitbake rev: f6e0d93c96d1626e7da298e296b1be9e425173b2) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py6
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 3a08330..8393f66 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -390,6 +390,9 @@ class Builder(gtk.Window):
390 def generate_configuration_async(self): 390 def generate_configuration_async(self):
391 self.handler.generate_configuration() 391 self.handler.generate_configuration()
392 392
393 def cancel_parse_sync(self):
394 self.handler.cancel_parse()
395
393 def load_template(self, path): 396 def load_template(self, path):
394 self.template = TemplateMgr() 397 self.template = TemplateMgr()
395 self.template.load(path) 398 self.template.load(path)
@@ -1011,9 +1014,6 @@ class Builder(gtk.Window):
1011 def show_configuration(self): 1014 def show_configuration(self):
1012 self.switch_page(self.BASEIMG_SELECTED) 1015 self.switch_page(self.BASEIMG_SELECTED)
1013 1016
1014 def stop_parse(self):
1015 self.handler.cancel_parse()
1016
1017 def stop_build(self): 1017 def stop_build(self):
1018 if self.stopping: 1018 if self.stopping:
1019 lbl = "<b>Force Stop build?</b>\nYou've already selected Stop once," 1019 lbl = "<b>Force Stop build?</b>\nYou've already selected Stop once,"
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 900244f..9a89378 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -251,7 +251,7 @@ class ImageConfigurationPage (HobPage):
251 return button_box 251 return button_box
252 252
253 def stop_button_clicked_cb(self, button): 253 def stop_button_clicked_cb(self, button):
254 self.builder.stop_parse() 254 self.builder.cancel_parse_sync()
255 255
256 def machine_combo_changed_cb(self, machine_combo): 256 def machine_combo_changed_cb(self, machine_combo):
257 combo_item = machine_combo.get_active_text() 257 combo_item = machine_combo.get_active_text()