From: Han-Wen Nienhuys Date: Thu, 2 Mar 2006 22:05:43 +0000 (+0000) Subject: release commit X-Git-Tag: release/2.7.37 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=refs%2Ftags%2Frelease%2F2.7.37;p=lilypond.git release commit --- diff --git a/ChangeLog b/ChangeLog index 3a8f95fdec..45cdb3853f 100644 --- 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 165e1aef6c..67c03d344d 100644 --- 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 cf2008decc..ef76bda7bc 100644 --- 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)