Imported Debian patch 2.12.3-5

diff --git a/debian/changelog b/debian/changelog
index 6bb2a3776b867a2743aae180905858bae6bd8ed8..87d97499e93bf335a01d53577a2464547b6be711 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lilypond (2.12.3-5) unstable; urgency=low
+
+  * Its guile that's being used, not MIT scheme; use access? instead of
+    file-writable? (Closes: #572290)
+
+ -- Don Armstrong <don@debian.org>  Thu, 04 Mar 2010 23:38:32 -0800
+
 lilypond (2.12.3-4) unstable; urgency=low
 
   * Scheme uses file-writeable for some reason (Closes: #572290)

diff --git a/scm/lily.scm b/scm/lily.scm
index bfbc77e62ae1695a66d7561a601270b6f58e39d2..93956a82e412cc9abb35ad6e58a3cd49052c7ff3 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -673,9 +673,9 @@ PIDs or the number of the process."
          (if separate-logs
              (open-file (if (string-or-symbol? (ly:get-option 'log-file))
                             (format "~a.log" (ly:get-option 'log-file))
-                            (if (file-writeable? "/dev/tty")
-                                ("/dev/tty")
-                                ("/dev/null"))) "a") #f))
+                            (if (access? "/dev/tty" W_OK)
+                                "/dev/tty"
+                                "/dev/null")) "a") #f))
         (do-measurements (ly:get-option 'dump-profile))
         (handler (lambda (key failed-file)
                    (set! failed (append (list failed-file) failed)))))