(read_pipe): only store and display error log

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index 89104b84e9aa2a4e41e9d525718ae7f27bb0f0f0..e705cb1e15e77d994fb59521bfe11ce5acf3243c 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -241,10 +241,13 @@ def error_log (name):
        return tempfile.mktemp ('%s.errorlog' % name)
 
 def read_pipe (cmd, mode = 'r'):
+       
+       
        redirect = ''
        error_log_file = ''
        if __main__.verbose_p:
                progress (_ ("Opening pipe `%s\'") % cmd)
+       else:
                error_log_file = error_log (command_name (cmd))
                redirect = ' 2>%s' % error_log_file
                
@@ -259,9 +262,12 @@ def read_pipe (cmd, mode = 'r'):
 
        if status:
                error (_ ("`%s\' failed (%d)") % (cmd, exit_status))
+               
                if not __main__.verbose_p:
-                       error (_ ("The error log is as follows:"))
-                       sys.stderr.write (open (error_log (command_name (cmd)).read ()))
+                       contents = open (error_log_file).read ()
+                       if contents:
+                               error (_ ("The error log is as follows:"))
+                               sys.stderr.write (contents)
                exit (status)
                
        if __main__.verbose_p: