* [denzil][PATCH 0/2] Hob error reporting fixes for denzil @ 2012-09-14 12:51 Paul Eggleton 2012-09-14 12:51 ` [denzil][PATCH 1/2] bitbake: hob: ensure error message text is properly escaped Paul Eggleton 2012-09-14 12:51 ` [denzil][PATCH 2/2] bitbake: hob: format error messages properly Paul Eggleton 0 siblings, 2 replies; 3+ messages in thread From: Paul Eggleton @ 2012-09-14 12:51 UTC (permalink / raw) To: Scott Garman, poky The following changes since commit 65ffa7395055f7e012cb973f63f92380828eed0d: yocto-bsp: use base branches for qemu 'newbranch' case (2012-08-21 11:35:22 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib paule/denzil-fixes-bitbake http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/denzil-fixes-bitbake Paul Eggleton (2): bitbake: hob: ensure error message text is properly escaped bitbake: hob: format error messages properly bitbake/lib/bb/ui/crumbs/builder.py | 5 +++-- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [denzil][PATCH 1/2] bitbake: hob: ensure error message text is properly escaped 2012-09-14 12:51 [denzil][PATCH 0/2] Hob error reporting fixes for denzil Paul Eggleton @ 2012-09-14 12:51 ` Paul Eggleton 2012-09-14 12:51 ` [denzil][PATCH 2/2] bitbake: hob: format error messages properly Paul Eggleton 1 sibling, 0 replies; 3+ messages in thread From: Paul Eggleton @ 2012-09-14 12:51 UTC (permalink / raw) To: Scott Garman, poky 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> --- bitbake/lib/bb/ui/crumbs/builder.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index df85326..870831a 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -21,6 +21,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import glib import gtk import copy import os @@ -644,7 +645,7 @@ class Builder(gtk.Window): def show_error_dialog(self, msg): 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) button = dialog.add_button("Close", gtk.RESPONSE_OK) HobButton.style_button(button) @@ -816,7 +817,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, glib.markup_escape_text(msg), gtk.STOCK_DIALOG_INFO) button = dialog.add_button("Close", gtk.RESPONSE_OK) HobButton.style_button(button) dialog.run() -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [denzil][PATCH 2/2] bitbake: hob: format error messages properly 2012-09-14 12:51 [denzil][PATCH 0/2] Hob error reporting fixes for denzil Paul Eggleton 2012-09-14 12:51 ` [denzil][PATCH 1/2] bitbake: hob: ensure error message text is properly escaped Paul Eggleton @ 2012-09-14 12:51 ` Paul Eggleton 1 sibling, 0 replies; 3+ messages in thread From: Paul Eggleton @ 2012-09-14 12:51 UTC (permalink / raw) To: Scott Garman, poky Error messages that use arguments need to be formatted properly, or we don't get the full message. Use a formatter to do this when an error occurs. Partial fix for [YOCTO #2983]. (Bitbake rev: 6783538884adecd914909a9ab4ca73c27575f3ad) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 74138cb..52acec1 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -178,7 +178,9 @@ class HobHandler(gobject.GObject): elif isinstance(event, logging.LogRecord): if event.levelno >= logging.ERROR: - self.error_msg += event.msg + '\n' + formatter = bb.msg.BBLogFormatter() + formatter.format(event) + self.error_msg += event.message + '\n' elif isinstance(event, bb.event.TargetsTreeGenerated): self.current_phase = "data generation" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-14 12:51 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-14 12:51 [denzil][PATCH 0/2] Hob error reporting fixes for denzil Paul Eggleton 2012-09-14 12:51 ` [denzil][PATCH 1/2] bitbake: hob: ensure error message text is properly escaped Paul Eggleton 2012-09-14 12:51 ` [denzil][PATCH 2/2] bitbake: hob: format error messages properly Paul Eggleton
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.