diff options
| author | Julien Rioux <jrioux@physics.utoronto.ca> | 2012-06-26 09:54:39 -0400 |
|---|---|---|
| committer | Julien Rioux <jrioux@physics.utoronto.ca> | 2012-06-29 04:37:31 -0400 |
| commit | 5e3f01b8ce09646a55838687ba4f1f38e2989afb (patch) | |
| tree | 72fa5d734212ac5bb439fa75911419f7cabcbb3d /scripts | |
| parent | b5250b853d1a520e8245b895ad11bfdf0d636275 (diff) | |
lilypond-book: Remove trailing path separators in include paths.
Remove the trailing path separators ("/" or "\") in include paths
(e.g. "-I ./ -I ../ -I ../common/") as they are not necessary and
cause problems on windows. Solves issue 2623.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lilypond-book.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 7fcec344de..1e0f7abf66 100644 --- 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,7 +644,7 @@ 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 |