Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
email: Catch exceptions during send.
authorDavid Soria Parra <dsp@php.net>
Mon, 27 Jul 2009 02:27:24 +0200
changeset 9246 2de7d96593db
parent 9245 d7d3afd935fa
child 9248 ac02b43bc08a
child 9283 b3ee4c2e1ff5
email: Catch exceptions during send. Catch SMTPlib exceptions to avoid mercurial showing a backtrace during an e.g. authentication error.
mercurial/mail.py file | annotate | diff | comparison | revisions 
--- a/mercurial/mail.py	Sat Jul 25 19:04:08 2009 -0500
+++ b/mercurial/mail.py	Mon Jul 27 02:27:24 2009 +0200
@@ -36,7 +36,10 @@
     if username and password:
         ui.note(_('(authenticating to mail server as %s)\n') %
                   (username))
-        s.login(username, password)
+        try:
+            s.login(username, password)
+        except smtplib.SMTPException, inst:
+            raise util.Abort(inst)
 
     def send(sender, recipients, msg):
         try:
hg-stable