CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/07/13 08:07:48
Modified files:
. : ChangeLog THANKS
scripts : lilypond-book.py
Log message:
Applied Yoshinobu Ishizaki's patch.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3871&tr2=1.3872&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.132&tr2=1.133&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-book.py.diff?tr1=1.268&tr2=1.269&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3871 lilypond/ChangeLog:1.3872
--- lilypond/ChangeLog:1.3871 Wed Jul 13 06:48:26 2005
+++ lilypond/ChangeLog Wed Jul 13 08:07:46 2005
@@ -1,3 +1,10 @@
+2005-07-13 Yoshinobu Isizaki <[EMAIL PROTECTED]>
+
+ * scripts/lilypond-book.py: Prevent occuring error when
+ 'lilypond-book --output=foo/ somefile.ly' is executed multiple
+ times and target file shoud be overwritten. (Error message said
+ 'input file and output file is same'.)
+
2005-07-13 Graham Percival <[EMAIL PROTECTED]>
* input/regression/slur-extreme.ly, input/regression/slur-scoring.ly,
@@ -6,6 +13,8 @@
Change "excentricity" to "eccentricity".
* Documentation/user/converters.itely: fix URL for Noteedit and
Rosegarden.
+
+ * THANKS: added Yoshinobu Isizaki.
2005-07-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.132 lilypond/THANKS:1.133
--- lilypond/THANKS:1.132 Tue Jul 12 20:46:24 2005
+++ lilypond/THANKS Wed Jul 13 08:07:47 2005
@@ -12,6 +12,7 @@
CONTRIBUTORS
Joe Neeman
+Yoshinobu Ishizaki
SPONSORS
Index: lilypond/scripts/lilypond-book.py
diff -u lilypond/scripts/lilypond-book.py:1.268
lilypond/scripts/lilypond-book.py:1.269
--- lilypond/scripts/lilypond-book.py:1.268 Mon Jul 11 12:51:13 2005
+++ lilypond/scripts/lilypond-book.py Wed Jul 13 08:07:48 2005
@@ -1428,18 +1428,19 @@
output_filename = '-'
output_file = sys.stdout
else:
+ # don't complain when output_name is existing
+ output_filename = input_base + format2ext[format]
if output_name:
if not os.path.isdir (output_name):
os.mkdir (output_name, 0777)
os.chdir (output_name)
-
- output_filename = input_base + format2ext[format]
- if os.path.exists (input_filename) \
- and os.path.exists (output_filename) \
- and os.path.samefile (output_filename, input_fullname):
- ly.error (
- _ ("Output would overwrite input file; use
--output."))
- ly.exit (2)
+ else:
+ if os.path.exists (input_filename) \
+ and os.path.exists (output_filename) \
+ and os.path.samefile (output_filename,
input_fullname):
+ ly.error (
+ _ ("Output would overwrite input file; use
--output."))
+ ly.exit (2)
try:
ly.progress (_ ("Reading %s...") % input_fullname)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
