scripts/convert-ly.py: honour the -n command line switch

diff --git a/ChangeLog b/ChangeLog
index 1b91969043380dea3f437e778af8af8e2ce59d32..ef6bf22fe6a4cc31adbf7f17f9e45c87ff27b8f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-11  Joe Neeman  <joeneeman@gmail.com>
+
+       * scripts/convert-ly.py: honour the -n command-line switch
+
 2006-08-10  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/output-lib.scm (bar-line::calc-glyph-name): add dashed liine

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 9c3ebeee831259632f5f265e13c39cb9b9032fd4..1f0ef120f1a1250dc9ce8baf87c2ca3bddadf762 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -53,8 +53,6 @@ copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
 program_name = os.path.basename (sys.argv[0])
 program_version = '@TOPLEVEL_VERSION@'
 
-add_version = 1
-
 def warning (s):
     sys.stderr.write (program_name + ": " + _ ("warning: %s") % s + '\n')
 
@@ -224,7 +222,7 @@ def do_one_file (infile_name):
         if lilypond_version_re.search (result):
             result = re.sub (lilypond_version_re_str,
                      '\\' + newversion, result)
-        elif add_version:
+        elif not global_options.skip_version_add:
             result = newversion + '\n' + result
             
         error_file.write ('\n')