merge with i18n stable 1.6.4
authorMatt Mackall <mpm@selenic.com>
Fri, 01 Oct 2010 10:16:52 -0500
branchstable
changeset 12609 93d8bff78c96
parent 12601 34a9a71d586c (current diff)
parent 12602 14198926975d (diff)
child 12610 80345db2b6a3
merge with i18n
--- a/mercurial/url.py	Fri Oct 01 11:15:19 2010 -0300
+++ b/mercurial/url.py	Fri Oct 01 10:16:52 2010 -0500
@@ -511,9 +511,10 @@
                         ca_certs=cacerts)
                 msg = _verifycert(self.sock.getpeercert(), self.host)
                 if msg:
-                    raise util.Abort('%s certificate error: %s' % (self.host, msg))
-                self.ui.debug(_('%s certificate successfully verified\n') % 
-                    self.host)
+                    raise util.Abort(_('%s certificate error: %s') %
+                                     (self.host, msg))
+                self.ui.debug('%s certificate successfully verified\n' %
+                              self.host)
             else:
                 httplib.HTTPSConnection.connect(self)