From c0b92702d367466641f88371fbcbc0fdebdbbb96 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Sat, 2 Jun 2012 12:54:38 +0800 Subject: Hob: Interpret some special characters for label markup Interpret some special characters for label markup, such as &, <, >, etc. Otherwise, the message dialog can't show them, and worsely, it makes the whole message blank. [Yocto #2492] (Bitbake rev: fb82f6eb5405274f702bd6d64cbe995fd4b74145) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index bcce41dbb6..7861a6fbaf 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -374,6 +374,15 @@ class Builder(gtk.Window): END_NOOP : None, } + @classmethod + def interpret_markup(cls, msg): + msg = msg.replace('&', '&') + msg = msg.replace('<', '<') + msg = msg.replace('>', '>') + msg = msg.replace('"', '"') + msg = msg.replace("'", "´") + return msg + def __init__(self, hobHandler, recipe_model, package_model): super(Builder, self).__init__() @@ -729,7 +738,7 @@ class Builder(gtk.Window): def show_error_dialog(self, msg): lbl = "Error\n" - lbl = lbl + "%s\n\n" % msg + lbl = lbl + "%s\n\n" % Builder.interpret_markup(msg) dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR) button = dialog.add_button("Close", gtk.RESPONSE_OK) HobButton.style_button(button) @@ -909,7 +918,7 @@ class Builder(gtk.Window): self.build_failed() def handler_no_provider_cb(self, running_build, msg): - dialog = CrumbsMessageDialog(self, msg, gtk.STOCK_DIALOG_INFO) + dialog = CrumbsMessageDialog(self, Builder.interpret_markup(msg), gtk.STOCK_DIALOG_INFO) button = dialog.add_button("Close", gtk.RESPONSE_OK) HobButton.style_button(button) dialog.run() -- cgit v1.2.3-54-g00ecf