Report problems sending mail. Thanks to Antti-Juhani Kaijanaho

1 files changed, 19 insertions, 7 deletions

diff --git a/eoc.py b/eoc.py
index 52621bc..124cac2 100644
--- a/eoc.py
+++ b/eoc.py
@@ -395,13 +395,21 @@ class MailingListManager:
                "\n    ".join(text[:text.find("\n\n")].split("\n"))))
         if recipients:
             if self.smtp_server:
-                smtp = smtplib.SMTP(self.smtp_server)
-                smtp.sendmail(envelope_sender, recipients, text)
-                smtp.quit()
+                try:
+                    smtp = smtplib.SMTP(self.smtp_server)
+                    smtp.sendmail(envelope_sender, recipients, text)
+                    smtp.quit()
+                except:
+                    error("Error sending SMTP mail, mail probably not sent")
+                    sys.exit(1)
             elif self.qmqp_server:
-                q = qmqp.QMQP(self.qmqp_server)
-                q.sendmail(envelope_sender, recipients, text)
-                q.quit()
+                try:
+                    q = qmqp.QMQP(self.qmqp_server)
+                    q.sendmail(envelope_sender, recipients, text)
+                    q.quit()
+                except:
+                    error("Error sending QMQP mail, mail probably not sent")
+                    sys.exit(1)
             else:
                 recipients = string.join(recipients, " ")
                 f = os.popen("%s -oi -f '%s' %s" % 
@@ -410,7 +418,11 @@ class MailingListManager:
                                   recipients),
                              "w")
                 f.write(text)
-                f.close()
+                status = f.close()
+                if status != 0:
+                    error("%s returned %d, mail sending probably failed" %
+                           (self.sendmail, status))
+                    sys.exit((status >> 8) & 0xff)
         else:
             debug("send_mail: no recipients, not sending")