mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: hob: ensure error message text is properly escaped

Browse Source 
Our lack of markup escaping was causing invalid markup, leading to the
error dialog being blank. Use the glib markup escaping function provided
by PyGTK+ to do this properly and avoid the blank error dialogs.

Partial fix for [YOCTO #2983].

(Bitbake rev: 563ea5233a5ab1629c51e802d04280692f96c596)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2012-09-10 18:11:17 +01:00
committed by Richard Purdie
parent d567e770c3
commit 4e09d164d9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/crumbs/builder.py
+3 -2
View File
@@ -21,6 +21,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import glib
import gtk import gtk
import copy import copy
import os import os
@@ -644,7 +645,7 @@ class Builder(gtk.Window):
def show_error_dialog(self, msg): def show_error_dialog(self, msg):
lbl = "<b>Error</b>\n" lbl = "<b>Error</b>\n"
lbl = lbl + "%s\n\n" % msg lbl = lbl + "%s\n\n" % glib.markup_escape_text(msg)
dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR) dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR)
button = dialog.add_button("Close", gtk.RESPONSE_OK) button = dialog.add_button("Close", gtk.RESPONSE_OK)
HobButton.style_button(button) HobButton.style_button(button)
@@ -816,7 +817,7 @@ class Builder(gtk.Window):
self.build_failed() self.build_failed()
def handler_no_provider_cb(self, running_build, msg): def handler_no_provider_cb(self, running_build, msg):
dialog = CrumbsMessageDialog(self, msg, gtk.STOCK_DIALOG_INFO) dialog = CrumbsMessageDialog(self, glib.markup_escape_text(msg), gtk.STOCK_DIALOG_INFO)
button = dialog.add_button("Close", gtk.RESPONSE_OK) button = dialog.add_button("Close", gtk.RESPONSE_OK)
HobButton.style_button(button) HobButton.style_button(button)
dialog.run() dialog.run()