jhbuild r2516 - in trunk: . jhbuild/frontends

[fpeters svn gnome org]

Author: fpeters
Date: Fri Nov 14 13:09:28 2008
New Revision: 2516
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2516&view=rev

Log:
* jhbuild/frontends/tinderbox.py: be more robust against improper
unicode in program outputs.  (closes: #560579)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/frontends/tinderbox.py

Modified: trunk/jhbuild/frontends/tinderbox.py
==============================================================================
--- trunk/jhbuild/frontends/tinderbox.py	(original)
+++ trunk/jhbuild/frontends/tinderbox.py	Fri Nov 14 13:09:28 2008
@@ -147,11 +147,13 @@
     return None
 
 def escape(string):
+    string = string.replace('&', '&')
     if type(string) is not unicode:
-        string = unicode(string, _encoding)
-    return string.replace('&','&amp;').replace('<','&lt;').replace(
+        string = unicode(string, _encoding, 'xmlcharrefreplace')
+    string = string.replace('<','&lt;').replace(
             '>','&gt;').replace('\n','<br/>').replace(
             '\t','&nbsp;&nbsp;&nbsp;&nbsp;')
+    return string
 
 class TinderboxBuildScript(buildscript.BuildScript):
     help_url = 'http://live.gnome.org/JhbuildIssues/'