Mercurial Mercurial > mercurial / 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.
mail: pass ui to sslutil.wrapsocket() even if verifycert is off (issue4713)
authorYuya Nishihara <yuya@tcha.org>
Sun, 07 Jun 2015 09:30:15 +0900
changeset 25463 03af5c2ddf75
parent 25462 021e68d37c5b
child 25464 504a1f295677
mail: pass ui to sslutil.wrapsocket() even if verifycert is off (issue4713) 21b536f01eda made 'ui' argument is passed via sslutil.sslkwargs(), but mailer doesn't call sslkwargs() if smtp.verifycert is off. So we have to put it in sslkwargs manually.
mercurial/mail.py file | annotate | diff | comparison | revisions 
--- a/mercurial/mail.py	Sat Jun 06 14:03:55 2015 +0200
+++ b/mercurial/mail.py	Sun Jun 07 09:30:15 2015 +0900
@@ -104,7 +104,8 @@
     if (starttls or smtps) and verifycert:
         sslkwargs = sslutil.sslkwargs(ui, mailhost)
     else:
-        sslkwargs = {}
+        # 'ui' is required by sslutil.wrapsocket() and set by sslkwargs()
+        sslkwargs = {'ui': ui}
     if smtps:
         ui.note(_('(using smtps)\n'))
         s = SMTPS(sslkwargs, local_hostname=local_hostname)
mercurial