''

diff --git a/ChangeLog b/ChangeLog
index 3d220d7106b7e2ef1c7ae17a6a2a31bf61fe8576..19e1c8785c66a2e02acf2772fa31e3e0805070c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-08  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
+
+       * scripts/midi2ly.py: Fix handling of -o
+
 2002-06-08  Han-Wen  <hanwen@cs.uu.nl>
 
        * lily/molecule.cc (translate): set max distance to 100 cm.

diff --git a/VERSION b/VERSION
index d38901bea9070fcf25a536af0f92836cc4290a91..2ddacd90b64a4273df02cc7f730f1f14eb9e35a4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=60
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 0ddc1aa56f70955be17fa31afb28c51ce053ed33..fbd9596eba41bf05366e74ad89b9d973f78338fb 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -1102,8 +1102,11 @@ for f in files:
                o = output_name
                (outdir, outbase) = os.path.split (o)
 
-       if outdir != '.':
-               mkdir_p (outdir, 0777)
+       if outdir != '.' and outdir != '':
+               try:
+                       os.mkdir (outdir, 0777)
+               except OSError:
+                       pass
 
        convert_midi (f, o)