(do_chroot_jail): correctness tweak.

diff --git a/ChangeLog b/ChangeLog
index f7241e98966e60f300e0799f5120e415fb703791..3e50037c96546a013ed2a2ade6e9bdd17c094742 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-05-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/main.cc (do_chroot_jail): correctness tweak.
+
+       * python/lilylib.py (system): import subprocess in system () only.
+
        * scripts/*.py: use TARGET_PYTHON iso PYTHON. Backportme.
 
        * make/substitute.make (ATVARIABLES): add TARGET_PYTHON as subst
@@ -29,7 +33,7 @@
 2006-05-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * python/lilylib.py (system): move import subprocess to system()
-       definition. Backportme.
+       definition. 
 
        * python/convertrules.py (conv): fix convert-ly rules for 2.9.4
 
@@ -109,10 +113,10 @@
        * Documentation/user/GNUmakefile: dist context-example.eps too.
 
        * lily/key-engraver.cc (create_key): use
-       explicitKeySignatureVisibility for cancellation too. Backportme.
+       explicitKeySignatureVisibility for cancellation too. 
 
        * lily/font-config.cc (init_fontconfig): don't close file if
-       f==NULL. Backportme.
+       f==NULL. 
 
 2006-05-15  Erlend Aasland  <erlenda@gmail.com>
 
@@ -5413,11 +5417,11 @@
        * scm/ps-to-png.scm: remove dir-re function.
        (make-ps-images): generate page names, instead of globbing them.
        This brings down LilyPond memory usage for make web by a factor
-       10. (backportme?) 
+       10. 
 
        * scripts/lilypond-book.py (Lilypond_snippet.png_is_outdated):
        don't use glob. With 3000 files, globbing
-       Documentation/user/out-www/ can take too much time. (backportme?)
+       Documentation/user/out-www/ can take too much time. 
        
        * lily/lily-guile.cc (gulp_file_to_string): take size argument.
 

diff --git a/THANKS b/THANKS
index e3204ab5a111fbe2022862e02e56dbc95c0b3f32..2130dc7271217707decfdb1271f429264451e1ce 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -49,6 +49,7 @@ J. Leung
 Harald Wellmann
 Keith Packard
 Orm Finnendahl
+Quentin Spencer
 Rick Hansen
 Sietse Brouwer
 Stephen Carter

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index b2c4ce7cbaa15231096f4a011e3f0c7d95ce3826..b0a87988a4809908419b5d4906a555cc5aa7ce53 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -206,7 +206,18 @@ ADD_TRANSLATOR (Key_engraver,
                /* doc */ "",
                /* create */ "KeySignature",
                /* accept */ "key-change-event",
-               /* read */ "keySignature printKeyCancellation lastKeySignature "
-               "explicitKeySignatureVisibility createKeyOnClefChange "
-               "keyAlterationOrder keySignature",
-               /* write */ "lastKeySignature tonic keySignature");
+               
+               /* read */
+               "createKeyOnClefChange "
+               "explicitKeySignatureVisibility "
+               "keyAlterationOrder "
+               "keySignature "
+               "keySignature "
+               "lastKeySignature "
+               "printKeyCancellation "
+               ,
+               
+               /* write */
+               "keySignature "
+               "lastKeySignature "
+               "tonic ")

diff --git a/lily/main.cc b/lily/main.cc
index ea5a29c7bc65e999aaf1f4601d4bccc10b4e7bea..af092830bf32567c66c3fe7e6b5123d4de4b982a 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -305,7 +305,7 @@ do_chroot_jail ()
   if (components.size () != JAIL_MAX)
     {
       error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX,
-                components.size ()));
+                (unsigned) components.size ()));
       exit (2);
     }