[Python-checkins] r65697 - doctools/trunk/sphinx/ext/pngmath.py

[georg.brandl]

Author: georg.brandl
Date: Fri Aug 15 21:21:09 2008
New Revision: 65697

Log:
Display stderr and stdout for LaTeX too.


Modified:
   doctools/trunk/sphinx/ext/pngmath.py

Modified: doctools/trunk/sphinx/ext/pngmath.py
==============================================================================
--- doctools/trunk/sphinx/ext/pngmath.py	(original)
+++ doctools/trunk/sphinx/ext/pngmath.py	Fri Aug 15 21:21:09 2008
@@ -112,7 +112,8 @@
         return relfn, None
     stdout, stderr = p.communicate()
     if p.returncode != 0:
-        raise MathExtError('latex exited with error:\n' + stdout)
+        raise MathExtError('latex exited with error:\n[stderr]\n%s\n[stdout]\n%s'
+                           % (stderr, stdout))
 
     ensuredir(path.dirname(outfn))
     # use some standard dvipng arguments
@@ -137,8 +138,8 @@
         return relfn, None
     stdout, stderr = p.communicate()
     if p.returncode != 0:
-        raise MathExtError('dvipng exited with error:\n[stdout]\n%s\n[stderr]%s'
-                           % (stdout, stderr))
+        raise MathExtError('dvipng exited with error:\n[stderr]\n%s\n[stdout]\n%s'
+                           % (stderr, stdout))
     depth = None
     if use_preview:
         for line in stdout.splitlines():