From 5a975239eabe1f1e5f03d3fb10fd7d31929f35aa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 28 May 2012 18:10:39 +0100 Subject: hob: handle sanity check failures as a separate event In order to show a friendlier error message that does not bury the actual sanity error in our typical preamble about disabling sanity checks, use a separate event to indicate that sanity checks failed. This change is intended to work together with the related change to sanity.bbclass in OE-Core. Fixes [YOCTO #2336]. (Bitbake rev: 24b631acdaa143a4de39c6e1328849660c66f219) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/ui/crumbs/builder.py') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 80a8d0160a..8d35ea96be 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -424,6 +424,7 @@ class Builder(gtk.Window): self.handler.connect("data-generated", self.handler_data_generated_cb) self.handler.connect("command-succeeded", self.handler_command_succeeded_cb) self.handler.connect("command-failed", self.handler_command_failed_cb) + self.handler.connect("sanity-failed", self.handler_sanity_failed_cb) self.handler.connect("recipe-populated", self.handler_recipe_populated_cb) self.handler.connect("package-populated", self.handler_package_populated_cb) @@ -727,10 +728,14 @@ class Builder(gtk.Window): def handler_command_failed_cb(self, handler, msg): if msg: - msg = msg.replace("your local.conf", "Settings") self.show_error_dialog(msg) self.reset() + def handler_sanity_failed_cb(self, handler, msg): + msg = msg.replace("your local.conf", "Settings") + self.show_error_dialog(msg) + self.reset() + def window_sensitive(self, sensitive): self.image_configuration_page.machine_combo.set_sensitive(sensitive) self.image_configuration_page.image_combo.set_sensitive(sensitive) -- cgit v1.2.3-54-g00ecf