import convertrules explicitly. This catches FatalConversionError() correctly.

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 1f0ef120f1a1250dc9ce8baf87c2ca3bddadf762..549e82b69c2570579616592b74ae0f5c95d96277 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -31,7 +31,7 @@ for p in ['share', 'lib']:
 import lilylib as ly
 global _;_=ly._
 
-from convertrules import *
+import convertrules
 
 lilypond_version_re_str = '\\\\version *\"([0-9.]+)"'
 lilypond_version_re = re.compile (lilypond_version_re_str)
@@ -133,13 +133,13 @@ def version_cmp (t1, t2):
 def get_conversions (from_version, to_version):
     def is_applicable (v, f = from_version, t = to_version):
         return version_cmp (v[0], f) > 0 and version_cmp (v[0], t) <= 0
-    return filter (is_applicable, conversions)
+    return filter (is_applicable, convertrules.conversions)
 
 def latest_version ():
-    return conversions[-1][0]
+    return convertrules.conversions[-1][0]
 
 def show_rules (file, from_version, to_version):
-    for x in conversions:
+    for x in convertrules.conversions:
         if (not from_version or x[0] > from_version) \
            and (not to_version or x[0] <= to_version):
             file.write  ('%s: %s\n' % (tup_to_str (x[0]), x[2]))
@@ -150,25 +150,24 @@ tuple (LAST,STR), with the last succesful conversion and the resulting
 string."""
     conv_list = get_conversions (from_version, to_version)
 
-    if error_file:
-        error_file.write (_ ("Applying conversion: "))
+    if convertrules.error_file:
+        convertrules.error_file.write (_ ("Applying conversion: "))
         
     last_conversion = ()
     try:
         for x in conv_list:
-            error_file.write (tup_to_str (x[0]))
+            convertrules.error_file.write (tup_to_str (x[0]))
             if x != conv_list[-1]:
-                error_file.write (', ')
+                convertrules.error_file.write (', ')
             str = x[1] (str)
             last_conversion = x[0]
 
-    except FatalConversionError:
-        error_file.write (_ ("error while converting")) 
-        error_file.write ('\n')
-        error_file.write (_ ("Aborting"))
-        error_file.write ('\n')
-
-
+    except convertrules.FatalConversionError:
+        convertrules.error_file.write ('\n'
+                                       + _ ("Error while converting")
+                                       + '\n'
+                                       + _ ("Stopping at last succesful rule")
+                                       + '\n')
 
     return (last_conversion, str)
 
@@ -225,7 +224,7 @@ def do_one_file (infile_name):
         elif not global_options.skip_version_add:
             result = newversion + '\n' + result
             
-        error_file.write ('\n')            
+        convertrules.error_file.write ('\n')            
     
         if global_options.edit:
             try: