retronetworking
/
capisuite
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6 from cloph/pr_sendmail 

subprocess module raises OSError instead of IOError
This commit is contained in:
Lars Immisch 2013-06-17 14:29:27 -07:00
parent 5c00a7c5f9 0a04dbdeeb
commit 2e06b64e1a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/helpers.pyin
View File

@ -50,11 +50,11 @@ def uniqueName(*args, **kwargs):
def __sendmail(mail_from, mail_to, msg):
import capisuite.core
from subprocess import Popen,PIPE,STDOUT
sendmail_p = Popen(['/usr/sbin/sendmail', '-t'], stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
try:
sendmail_p = Popen(['/usr/sbin/sendmail', '-t'], stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
text = sendmail_p.communicate(msg.as_string())[0]
except IOError: #Errno 32: Broken Pipe
capisuite.core.error("Error while calling sendmail. Not installed?\n")
except OSError as (errno, errstr): #Errno 32: Broken Pipe
capisuite.core.error("Error while calling sendmail. Not installed? (%s)\n" % errstr)
return 0
if text:
capisuite.core.error("Error while calling sendmail")#, return code=%i" % ret)