# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 2010-10-01 14:43:03
# Node ID 1393a81b3bdcd7d4fb4ca4016febe05e36210fd4
# Parent  5c8353692123ba43cbefc76746bb5b48e1c6d29b
# Parent  14198926975d1aadad4b48e6e829c724d2516d65

merge with stable

diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -528,9 +528,10 @@ if has_https:
                         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)