Doc [nl]: Translation update.

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index db4d0456b76c049bc25ff7c896d7602e14da2a1a..dac53c16cf4dd5d83c2111e4ba49e28701f410b0 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -23,7 +23,6 @@ import re
 import shutil
 import sys
 import optparse
-import time
 
 ################################################################
 # Users of python modules should include this snippet
@@ -42,7 +41,7 @@ try:
     _ = t.ugettext
 except:
     def _ (s):
-       return s
+        return s
 underscore = _
 
 # Urg, Python 2.4 does not define stderr/stdout encoding
@@ -119,7 +118,6 @@ def subprocess_system (cmd,
                        ignore_error=False,
                        progress_p=True,
                        be_verbose=False,
-                       redirect_output=False,
                        log_file=None):
     import subprocess
 
@@ -127,62 +125,46 @@ def subprocess_system (cmd,
     name = command_name (cmd)
     error_log_file = ''
 
-    if redirect_output:
-        progress (_ ("Processing %s.ly") % log_file)
+    if be_verbose:
+       show_progress = 1
+       progress (_ ("Invoking `%s\'") % cmd)
     else:
-        if be_verbose:
-            show_progress = 1
-            progress (_ ("Invoking `%s\'") % cmd)
-        else:
-            progress ( _("Running %s...") % name)
+       progress ( _("Running %s...") % name)
+
 
     stdout_setting = None
-    stderr_setting = None
     if not show_progress:
-        stdout_setting = subprocess.PIPE
-
-    if redirect_output:
-        stdout_filename = ''.join([log_file, '.log'])
-        stderr_filename = ''.join([log_file, '.err.log'])
-        stdout_setting = open(stdout_filename, 'w')
-        stderr_setting = open(stderr_filename, 'w')
+       stdout_setting = subprocess.PIPE
 
     proc = subprocess.Popen (cmd,
-                            shell=True,
-                            universal_newlines=True,
-                            stdout=stdout_setting,
-                            stderr=stdout_setting)
+                             shell=True,
+                             universal_newlines=True,
+                             stdout=stdout_setting,
+                             stderr=stdout_setting)
 
     log = ''
 
-    if redirect_output:
-        while proc.poll()==None:
-            time.sleep(1)
-        retval = proc.returncode
-        stdout_setting.close()
-        stderr_setting.close()
+    if show_progress:
+       retval = proc.wait()
     else:
-        if show_progress:
-            retval = proc.wait()
-        else:
-            log = proc.communicate ()
-            retval = proc.returncode
+       log = proc.communicate ()
+       retval = proc.returncode
 
 
     if retval:
-       print >>sys.stderr, 'command failed:', cmd
-       if retval < 0:
-           print >>sys.stderr, "Child was terminated by signal", -retval
-       elif retval > 0:
-           print >>sys.stderr, "Child returned", retval
-
-       if ignore_error:
-           print >>sys.stderr, "Error ignored"
-       else:
-           if not show_progress:
-               print log[0]
-               print log[1]
-           sys.exit (1)
+        print >>sys.stderr, 'command failed:', cmd
+        if retval < 0:
+            print >>sys.stderr, "Child was terminated by signal", -retval
+        elif retval > 0:
+            print >>sys.stderr, "Child returned", retval
+
+        if ignore_error:
+            print >>sys.stderr, "Error ignored"
+        else:
+            if not show_progress:
+                print log[0]
+                print log[1]
+            sys.exit (1)
 
     return abs (retval)
 
@@ -195,23 +177,23 @@ def ossystem_system (cmd,
 
     name = command_name (cmd)
     if be_verbose:
-       show_progress = 1
-       progress (_ ("Invoking `%s\'") % cmd)
+        show_progress = 1
+        progress (_ ("Invoking `%s\'") % cmd)
     else:
-       progress ( _("Running %s...") % name)
+        progress ( _("Running %s...") % name)
 
     retval = os.system (cmd)
     if retval:
-       print >>sys.stderr, 'command failed:', cmd
-       if retval < 0:
-           print >>sys.stderr, "Child was terminated by signal", -retval
-       elif retval > 0:
-           print >>sys.stderr, "Child returned", retval
-
-       if ignore_error:
-           print >>sys.stderr, "Error ignored"
-       else:
-           sys.exit (1)
+        print >>sys.stderr, 'command failed:', cmd
+        if retval < 0:
+            print >>sys.stderr, "Child was terminated by signal", -retval
+        elif retval > 0:
+            print >>sys.stderr, "Child returned", retval
+
+        if ignore_error:
+            print >>sys.stderr, "Error ignored"
+        else:
+            sys.exit (1)
 
     return abs (retval)
 
@@ -225,7 +207,7 @@ if sys.platform == 'mingw32':
 def strip_extension (f, ext):
     (p, e) = os.path.splitext (f)
     if e == ext:
-       e = ''
+        e = ''
     return p + e
 
 
@@ -233,34 +215,34 @@ def search_exe_path (name):
     p = os.environ['PATH']
     exe_paths = p.split (':')
     for e in exe_paths:
-       full = os.path.join (e, name)
-       if os.path.exists (full):
-           return full
+        full = os.path.join (e, name)
+        if os.path.exists (full):
+            return full
     return None
 
 
 def print_environment ():
     for (k,v) in os.environ.items ():
-       sys.stderr.write ("%s=\"%s\"\n" % (k, v))
+        sys.stderr.write ("%s=\"%s\"\n" % (k, v))
 
 class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
     def format_heading(self, heading):
-       if heading:
-           return heading[0].upper() + heading[1:] + ':\n'
-       return ''
+        if heading:
+            return heading[0].upper() + heading[1:] + ':\n'
+        return ''
     def format_option_strings(self, option):
-       sep = ' '
-       if option._short_opts and option._long_opts:
-           sep = ','
+        sep = ' '
+        if option._short_opts and option._long_opts:
+            sep = ','
 
-       metavar = ''
-       if option.takes_value():
-           metavar = '=%s' % option.metavar or option.dest.upper()
+        metavar = ''
+        if option.takes_value():
+            metavar = '=%s' % option.metavar or option.dest.upper()
 
-       return "%3s%s %s%s" % (" ".join (option._short_opts),
-                              sep,
-                              " ".join (option._long_opts),
-                              metavar)
+        return "%3s%s %s%s" % (" ".join (option._short_opts),
+                               sep,
+                               " ".join (option._long_opts),
+                               metavar)
 
     # Only use one level of indentation (even for groups and nested groups),
     # since we don't indent the headeings, either
@@ -277,7 +259,7 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
         return _("Usage: %s") % usage + '\n'
 
     def format_description(self, description):
-       return description
+        return description
 
 def get_option_parser (*args, **kwargs):
     p = optparse.OptionParser (*args, **kwargs)