diff options
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 13 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index f52b475ea9..1363475d3b 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -430,12 +430,13 @@ class Builder(gtk.Window): | |||
430 | self.switch_page(self.IMAGE_GENERATED) | 430 | self.switch_page(self.IMAGE_GENERATED) |
431 | 431 | ||
432 | def handler_command_failed_cb(self, handler, msg): | 432 | def handler_command_failed_cb(self, handler, msg): |
433 | lbl = "<b>Error</b>\n" | 433 | if msg: |
434 | lbl = lbl + "%s\n\n" % msg | 434 | lbl = "<b>Error</b>\n" |
435 | dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING) | 435 | lbl = lbl + "%s\n\n" % msg |
436 | dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK) | 436 | dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING) |
437 | response = dialog.run() | 437 | dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK) |
438 | dialog.destroy() | 438 | response = dialog.run() |
439 | dialog.destroy() | ||
439 | self.handler.clear_busy() | 440 | self.handler.clear_busy() |
440 | self.configuration.curr_mach = None | 441 | self.configuration.curr_mach = None |
441 | self.image_configuration_page.switch_machine_combo() | 442 | self.image_configuration_page.switch_machine_combo() |
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 9c82bfe6fd..cd257548e4 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -238,9 +238,8 @@ class HobHandler(gobject.GObject): | |||
238 | 238 | ||
239 | elif isinstance(event, bb.command.CommandFailed): | 239 | elif isinstance(event, bb.command.CommandFailed): |
240 | self.commands_async = [] | 240 | self.commands_async = [] |
241 | if self.error_msg: | 241 | self.emit("command-failed", self.error_msg) |
242 | self.emit("command-failed", self.error_msg) | 242 | self.error_msg = "" |
243 | self.error_msg = "" | ||
244 | elif isinstance(event, (bb.event.ParseStarted, | 243 | elif isinstance(event, (bb.event.ParseStarted, |
245 | bb.event.CacheLoadStarted, | 244 | bb.event.CacheLoadStarted, |
246 | bb.event.TreeDataPreparationStarted, | 245 | bb.event.TreeDataPreparationStarted, |