From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Wed, 7 Jul 2010 11:55:18 +0000 (+0200)
Subject: Lilypond-book: Variable name clash
X-Git-Tag: release/2.15.9-1~9^2~41
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=262598d458df6e8df4c93fc723be4549145e5b6b;p=lilypond.git

Lilypond-book: Variable name clash
---

diff --git a/python/book_snippets.py b/python/book_snippets.py
index aedee3ceef..b4849a0dbb 100644
--- a/python/book_snippets.py
+++ b/python/book_snippets.py
@@ -752,16 +752,16 @@ printing diff against existing file." % filename)
             status = 0
             output = stdout.read ()
             status = stdout.close ()
-            error = stderr.read ()
+            err = stderr.read ()
 
         if not status:
             status = 0
         signal = 0x0f & status
-        if status or (not output and error):
+        if status or (not output and err):
             exit_status = status >> 8
             ly.error (_ ("`%s' failed (%d)") % (cmd, exit_status))
             ly.error (_ ("The error log is as follows:"))
-            ly.stderr_write (error)
+            ly.stderr_write (err)
             ly.stderr_write (stderr.read ())
             exit (status)