Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mail.py @ 5472:23889160905a 0.9.5
Catch smtp exceptions
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 07 Sep 2007 16:48:42 +0200 |
parents | a11e13d50645 |
children | 4fba4fee0718 |
line wrap: on
line diff
--- a/mercurial/mail.py Fri Oct 19 19:20:33 2007 +0000 +++ b/mercurial/mail.py Fri Sep 07 16:48:42 2007 +0200 @@ -67,7 +67,13 @@ return _sendmail(ui, method) def sendmail(ui, sender, recipients, msg): - return connect(ui).sendmail(sender, recipients, msg) + try: + return connect(ui).sendmail(sender, recipients, msg) + except smtplib.SMTPRecipientsRefused, inst: + recipients = [r[1] for r in inst.recipients.values()] + raise util.Abort('\n' + '\n'.join(recipients)) + except smtplib.SMTPException, inst: + raise util.Abort(inst) def validateconfig(ui): '''determine if we have enough config data to try sending email.'''