[Erp5-report] r23561 - /erp5/trunk/products/ERP5/Document/Image.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Sep 11 13:17:35 2008
New Revision: 23561

URL: http://svn.erp5.org?rev=23561&view=rev
Log:
output error if conversion failed.

Modified:
    erp5/trunk/products/ERP5/Document/Image.py

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=23561&r1=23560&r2=23561&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py (original)
+++ erp5/trunk/products/ERP5/Document/Image.py Thu Sep 11 13:17:35 2008
@@ -377,8 +377,9 @@
       process = subprocess.Popen(parameter_list,
                                  stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE,
                                  close_fds=True)
-      imgin, imgout = process.stdin, process.stdout
+      imgin, imgout, err = process.stdin, process.stdout, process.stderr
 
       def writeData(stream, data):
         if isinstance(data, str):
@@ -395,7 +396,7 @@
       newimg.write(imgout.read())
       imgout.close()
       if not newimg.tell():
-        raise ConversionError('Image conversion failed (empty file).')
+        raise ConversionError('Image conversion failed (%s).' % err.read())
       newimg.seek(0)
       return newimg