[jhbuild] Transform exception to string only when required

[Frederic Peters <fpeters src gnome org>]

commit f3cd982320ed7d7cb64b31a27619da19fdc3b115
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat Jul 3 19:17:57 2010 +0200

    Transform exception to string only when required

 jhbuild/frontends/autobuild.py |    3 +++
 jhbuild/modtypes/__init__.py   |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/frontends/autobuild.py b/jhbuild/frontends/autobuild.py
index d181121..7e9ca19 100644
--- a/jhbuild/frontends/autobuild.py
+++ b/jhbuild/frontends/autobuild.py
@@ -256,6 +256,9 @@ class AutobuildBuildScript(buildscript.BuildScript, TerminalBuildScript):
             if module in self.modules.modules.keys() \
                    and self.modules.modules[module].test_type == 'ldtp':
                 self._upload_logfile(module)
+
+        if isinstance(error, Exception):
+            error = unicode(error)
         self.server.end_phase(self.build_id, module, phase, compress_data(log), error)
 
     def handle_error(self, module, phase, nextphase, error, altphases):
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 70d822e..ddcde15 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -164,7 +164,7 @@ class Package:
             error_phases = []
             if hasattr(method, 'error_phases'):
                 error_phases = method.error_phases
-            return (str(e), error_phases)
+            return (e, error_phases)
         else:
             return (None, None)