Hob error reporting fixes for denzil

PATCH New Paul Eggleton 1 participant 3 messages Sep 14, 2012

lore

Share & tools

lore

Paul Eggleton

author

2012-09-14 12:51 UTC #0 lore raw

cover Hob error reporting fixes for denzil

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(-)

Signature · 1 line

1.7.9.5

Paul Eggleton

author

2012-09-14 12:51 UTC #1 lore raw

PATCH 1/2 bitbake: hob: ensure error message text is properly escaped

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 <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 bitbake/lib/bb/ui/crumbs/builder.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

bitbake/lib/bb/ui/crumbs/builder.py +3 -2

index df85326..870831a 100755
@@ -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()

Signature · 1 line

1.7.9.5

Paul Eggleton

author

2012-09-14 12:51 UTC #2 lore raw

PATCH 2/2 bitbake: hob: format error messages properly

In reply to Paul Eggleton

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 <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 bitbake/lib/bb/ui/crumbs/hobeventhandler.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

bitbake/lib/bb/ui/crumbs/hobeventhandler.py +3 -1

index 74138cb..52acec1 100644
@@ -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"

Signature · 1 line

1.7.9.5