Merge branch 'translation' into staging

[lilypond.git] / scripts / lilypond-book.py

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 7fcec344de7088fe26e6a2f2ddab250b4a2a13e4..903e5e522176b6a31b97a1edd424ae1179dda3a5 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -616,7 +616,7 @@ def inverse_relpath (path, relpath):
     return the first path relative to the second."""
     if os.path.isabs (relpath):
         return os.path.abspath (path)
-    relparts = ['']
+    relparts = []
     parts = os.path.normpath (path).split (os.path.sep)
     for part in os.path.normpath (relpath).split (os.path.sep):
         if part == '..':
@@ -644,14 +644,14 @@ def do_options ():
         global_options.output_dir = os.path.expanduser (global_options.output_dir)
         global_options.include_path.insert (0, inverse_relpath (original_dir, global_options.output_dir))
 
-    global_options.include_path.insert (0, ".%s" % os.path.sep)
+    global_options.include_path.insert (0, ".")
 
     # Load the python packages (containing e.g. custom formatter classes)
     # passed on the command line
     nr = 0
     for i in global_options.custom_packages:
         nr += 1
-        print imp.load_source ("book_custom_package%s" % nr, i)
+        progress (str(imp.load_source ("book_custom_package%s" % nr, i)))
 
 
     if global_options.warranty: