release commit

diff --git a/ChangeLog b/ChangeLog
index 3a8f95fdec299fcee60cfecc8e0a8568091af0f6..45cdb3853ff32e9d77c26b6aab25f86b79182110 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        (error_log): remove pseudo_filter_p
        remove read_pipe
        remove cp_to_dir
+       remove identify
 
        * scripts/lilypond-book.py (Lilypond_snippet.compose_ly): don't
        use __main__

diff --git a/python/lilylib.py b/python/lilylib.py
index 165e1aef6c16f81e8822852e81481aa54c2c3c2d..67c03d344dafe98802e8f78314530c0bb17ea257 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -55,6 +55,7 @@ except:
        def _ (s):
                return s
 underscore = _
+progress = sys.stderr.write 
 
 
 def command_name (cmd):

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index cf2008deccd71c6b6abb2d9cefdd3cd7cb11d989..ef76bda7bc2a16b918b00e0d6e84491e3e27b5fc 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -108,7 +108,8 @@ def exit (i):
 def identify ():
        sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version))
 
-progress=sys.stderr.write
+def progress (s):
+       sys.stderr.write (s)
 
 def warning (s):
        sys.stderr.write (program_name + ": " + _ ("warning: %s") % s + '\n')
@@ -1690,7 +1691,7 @@ def main ():
                global_options.process_cmd += string.join ([(' -I %s' % commands.mkarg (p))
                                                            for p in global_options.include_path])
 
-       ly.identify (sys.stderr)
+       identify ()
 
        try:
                chunks = do_file (file)