From: fred Date: Wed, 27 Mar 2002 02:00:27 +0000 (+0000) Subject: lilypond-1.5.21 X-Git-Tag: release/1.5.59~484 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=51d52eafac36782e4c45177b04fb197ec89f0031;p=lilypond.git lilypond-1.5.21 --- diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index 6765e199b9..073071203e 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -101,6 +101,9 @@ rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp %_install_info lilypond.info %_install_info lilypond-internals.info +echo 'Please logout first before using LilyPond.' + + %preun %_remove_install_info lilypond.info %_remove_install_info lilypond-internals.info diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 7f047cda27..1489a8cc53 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -86,6 +86,9 @@ rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp /sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir %endif + +echo 'Please logout first before using LilyPond.' + %preun %if info=="yes" diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index 7b902765f2..f80334bc14 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -256,7 +256,8 @@ class Global_measure: def set_timesig (self, finale): (beats, fdur) = finale (log, dots) = EDU_to_duration (fdur) - assert dots == 0 + if dots <> 0: + sys.stderr.write ("\nHuh? Beat duration has a dot? (EDU Duration = %d)" % fdur) self.timesig = (beats, log) def length (self): @@ -992,8 +993,11 @@ class Etf_file: frame_obj_list = [None] for frno in m.frames: - fr = self.frames[frno] - frame_obj_list.append (fr) + try: + fr = self.frames[frno] + frame_obj_list.append (fr) + except IndexError: + sys.stderr.write ("\nNon-existent frame %d" % frno) m.frames = frame_obj_list for fr in frame_obj_list[1:]: