Merge lp:~therp-nl/openobject-server/7.0-lp1299132-check_smtp_sendmail_return_value into lp:openobject-server/7.0

[Stefan Rijnhart (Opener)]

Signal failed recipients as returned by smtp.sendmail. The exception is crafted taking into account that the outer try block rehashes its contents into a MailDeliveryException.

Unmerged revisions

5268. By Stefan Rijnhart (Opener) on 2014-03-28

[FIX] Check return value of smtp.sendmail containing failed recipients

=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
--- openerp/addons/base/ir/ir_mail_server.py	2013-09-18 14:38:07 +0000
+++ openerp/addons/base/ir/ir_mail_server.py	2014-03-28 19:40:55 +0000
@@ -460,7 +460,14 @@
 
             try:
                 smtp = self.connect(smtp_server, smtp_port, smtp_user, smtp_password, smtp_encryption or False, smtp_debug)
-                smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
+                refused = smtp.sendmail(
+                    smtp_from, smtp_to_list, message.as_string())
+                if refused:
+                    raise osv.except_osv(
+                        _("Mail did not reach the following recipients:"),
+                        '\n'.join(["%s: %s" % (
+                                    tools.ustr(recipient), tools.ustr(error))
+                                   for recipient, error in refused.iteritems()]))
             finally:
                 try:
                     # Close Connection of SMTP Server