Mercurial > gub

changeset 3442:0db91097fcb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not miss last (often error) line.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 07 May 2007 08:36:20 +0200
parents 66992c82c423
children bf1d8bdfc44e
files gub/oslog.py gub/specs/darwin/odcctools.py
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gub/oslog.py	Sat May 05 13:40:43 2007 +0200
+++ b/gub/oslog.py	Mon May 07 08:36:20 2007 +0200
@@ -59,10 +59,13 @@
             self.log (line, level['output'], verbose)
             time.sleep (0.0001)
 
-        if proc.returncode and not ignore_errors:
-            m = 'Command barfed: %s\n' % cmd
+        line = proc.stdout.readline ()
+        self.log (line, level['output'], verbose)
+        if proc.returncode:
+            m = 'Command barfed: %(cmd)s\n' % locals ()
             self.error (m)
-            raise misc.SystemFailed (m)
+	    if not ignore_errors:
+        	raise misc.SystemFailed (m)
 
         return 0
 
--- a/gub/specs/darwin/odcctools.py	Sat May 05 13:40:43 2007 +0200
+++ b/gub/specs/darwin/odcctools.py	Mon May 07 08:36:20 2007 +0200
@@ -5,7 +5,8 @@
     def __init__ (self, settings):
         cross.CrossToolSpec.__init__ (self, settings)
         self.with (version='20060413',
-                   # version='20060608',
+                   ####version='20060608',
+                   #version='20061117',
                    mirror=mirrors.opendarwin,
                    format='bz2')
     def get_build_dependencies (self):