Patchwork [2,of,8] sslutil: change comment and logged message for found ca cert file

login
register
mail settings
Submitter Gregory Szorc
Date July 2, 2016, 2:57 a.m.
Message ID <9b25d8e1497ab9da8f05.1467428258@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/15717/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Gregory Szorc - July 2, 2016, 2:57 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1467421431 25200
#      Fri Jul 01 18:03:51 2016 -0700
# Node ID 9b25d8e1497ab9da8f056c0370168c4f91abdfd9
# Parent  142d3941bd4374998b8f0e92c287b431863ca95c
sslutil: change comment and logged message for found ca cert file

Future patches will change _defaultcacerts() to do something
on platforms that aren't OS X. Change the comment and logged
message to reflect the future.

Patch

diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py
--- a/mercurial/sslutil.py
+++ b/mercurial/sslutil.py
@@ -191,20 +191,20 @@  def _hostsettings(ui, hostname):
             cafile = ui.config('web', 'cacerts')
 
             if cafile:
                 cafile = util.expandpath(cafile)
                 if not os.path.exists(cafile):
                     raise error.Abort(_('could not find web.cacerts: %s') %
                                       cafile)
             else:
-                # No global CA certs. See if we can load defaults.
+                # CAs not defined in config. Try to find system bundles.
                 cafile = _defaultcacerts()
                 if cafile:
-                    ui.debug('using %s to enable OS X system CA\n' % cafile)
+                    ui.debug('using %s for CA file\n' % cafile)
 
             s['cafile'] = cafile
 
         # Require certificate validation if CA certs are being loaded and
         # verification hasn't been disabled above.
         if cafile or (_canloaddefaultcerts and s['allowloaddefaultcerts']):
             s['verifymode'] = ssl.CERT_REQUIRED
         else: