Imported Debian patch 2.12.3-3

diff --git a/debian/changelog b/debian/changelog
index 45fa63e626128687a34e3fa59371637d1fec945f..bcd1ee9607364fd8ec647117ab10a8ae7ceef082 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lilypond (2.12.3-3) unstable; urgency=low
+
+  * Use /dev/null if /dev/tty isn't writable (Closes: #572290)
+
+ -- Don Armstrong <don@debian.org>  Wed, 03 Mar 2010 17:56:55 -0800
+
 lilypond (2.12.3-2) unstable; urgency=low
 
   * Build-Depend on rsync (Closes: #571670)

diff --git a/scm/lily.scm b/scm/lily.scm
index d62c70bb0ff471637ce3aabe05f7c01fc40e1295..3b6ef0dee7d00ccf4539730b4d800cf1de2cb526 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -673,7 +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))
-                            "/dev/tty") "a") #f))
+                            (if (file-writable? "/dev/tty")
+                                ("/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)))))