jhbuild r2120 - in trunk: . jhbuild jhbuild/frontends jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Fri May 30 14:17:58 2008
New Revision: 2120
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2120&view=rev

Log:
* jhbuild/frontends/terminal.py, jhbuild/versioncontrol/hg.py,
jhbuild/main.py: removed a few redundant "Error" labels.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/frontends/terminal.py
   trunk/jhbuild/main.py
   trunk/jhbuild/versioncontrol/hg.py

Modified: trunk/jhbuild/frontends/terminal.py
==============================================================================
--- trunk/jhbuild/frontends/terminal.py	(original)
+++ trunk/jhbuild/frontends/terminal.py	Fri May 30 14:17:58 2008
@@ -171,7 +171,6 @@
         try:
             p = subprocess.Popen(command, **kws)
         except OSError, e:
-            sys.stderr.write(_('Error: %s\n') % str(e))
             raise CommandError(str(e))
 
         output = []

Modified: trunk/jhbuild/main.py
==============================================================================
--- trunk/jhbuild/main.py	(original)
+++ trunk/jhbuild/main.py	Fri May 30 14:17:58 2008
@@ -112,7 +112,7 @@
     try:
         config = jhbuild.config.Config(options.configfile)
     except FatalError, exc:
-        sys.stderr.write('jhbuild: %s\n' % (str(exc)))
+        sys.stderr.write('jhbuild: %s\n' % exc.message.encode(_encoding, 'replace'))
         sys.exit(1)
 
     if options.moduleset: config.moduleset = options.moduleset

Modified: trunk/jhbuild/versioncontrol/hg.py
==============================================================================
--- trunk/jhbuild/versioncontrol/hg.py	(original)
+++ trunk/jhbuild/versioncontrol/hg.py	Fri May 30 14:17:58 2008
@@ -106,7 +106,6 @@
             hg = Popen(['hg', 'ti', '--template', '{node}'], stdout=PIPE,
                        cwd=self.srcdir)
         except OSError, e:
-            sys.stderr.write('Error: %s\n' % str(e))
             raise CommandError(str(e))
         return hg.stdout.read().strip()