# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1285944183 -7200
# Node ID 1393a81b3bdcd7d4fb4ca4016febe05e36210fd4
# Parent  5c8353692123ba43cbefc76746bb5b48e1c6d29b# Parent  14198926975d1aadad4b48e6e829c724d2516d65
merge with stable

diff -r 5c8353692123 -r 1393a81b3bdc mercurial/url.py
--- a/mercurial/url.py	Fri Oct 01 16:39:55 2010 +0200
+++ b/mercurial/url.py	Fri Oct 01 16:43:03 2010 +0200
@@ -528,9 +528,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)