Merge branch 'release/debian/2.0.5-1'HEADdebian/2.0.5-1master

1 files changed, 4 insertions, 3 deletions

diff --git a/mwctools.py b/mwctools.py
index cefbbf0..1dca2e6 100755
--- a/mwctools.py
+++ b/mwctools.py
@@ -33,12 +33,13 @@ class Receiver(Parser):
 
 
 class Content:
-    def __init__(self, uri, encoding, title, content, contenttype):
+    def __init__(self, uri, encoding, title, content, contenttype, additional=None):
         self.uri = uri
         self.encoding = encoding
         self.title = title
         self.content = content
         self.contenttype = contenttype
+        self.additional = additional
 
 
 # returns a short subject line
@@ -106,13 +107,13 @@ class CommandReceiver(Receiver):
             contentList = []
 
         # run command and retrieve output
-        process = subprocess.Popen(self.command, stdout=subprocess.PIPE, shell=True, close_fds=True)
+        process = subprocess.Popen(self.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, close_fds=True)
         thefile = process.stdout
         result = thefile.read().decode(self.encoding, errors='ignore')
         thefile.close()
 
         if process.wait() != 0:
-            raise Exception("process terminated with an error")
+            raise Exception("process terminated with an error: " + str(process.stderr) + "\n" + result)
 
         contentList.append(Content(uri=None, encoding=self.encoding, title=None, content=result, contenttype=self.contenttype))
         return contentList