jhbuild r2128 - in trunk: . jhbuild/frontends

[fpeters svn gnome org]

Author: fpeters
Date: Wed Jun  4 06:44:13 2008
New Revision: 2128
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2128&view=rev

Log:
* jhbuild/frontends/terminal.py: fixed print of unencoded characters to
console, when reporting conflicts after a checkout.



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

Modified: trunk/jhbuild/frontends/terminal.py
==============================================================================
--- trunk/jhbuild/frontends/terminal.py	(original)
+++ trunk/jhbuild/frontends/terminal.py	Wed Jun  4 06:44:13 2008
@@ -201,7 +201,7 @@
 
             cmds.pprint_output(p, format_line)
             if conflicts:
-                sys.stdout.write(_('\nConflicts during checkout:\n'))
+                uprint(_('\nConflicts during checkout:\n'))
                 for line in conflicts:
                     sys.stdout.write('%s  %s%s\n'
                                      % (t_colour[12], line, t_reset))