Mercurial > public > mercurial-scm > hg
comparison mercurial/sslutil.py @ 29482:4e72995f6c9c
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.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 01 Jul 2016 18:03:51 -0700 |
| parents | fd93b15b5c30 |
| children | 918dce4b8c26 |
comparison
equal
deleted
inserted
replaced
| 29481:5caa415aa48b | 29482:4e72995f6c9c |
|---|---|
| 194 cafile = util.expandpath(cafile) | 194 cafile = util.expandpath(cafile) |
| 195 if not os.path.exists(cafile): | 195 if not os.path.exists(cafile): |
| 196 raise error.Abort(_('could not find web.cacerts: %s') % | 196 raise error.Abort(_('could not find web.cacerts: %s') % |
| 197 cafile) | 197 cafile) |
| 198 else: | 198 else: |
| 199 # No global CA certs. See if we can load defaults. | 199 # CAs not defined in config. Try to find system bundles. |
| 200 cafile = _defaultcacerts() | 200 cafile = _defaultcacerts() |
| 201 if cafile: | 201 if cafile: |
| 202 ui.debug('using %s to enable OS X system CA\n' % cafile) | 202 ui.debug('using %s for CA file\n' % cafile) |
| 203 | 203 |
| 204 s['cafile'] = cafile | 204 s['cafile'] = cafile |
| 205 | 205 |
| 206 # Require certificate validation if CA certs are being loaded and | 206 # Require certificate validation if CA certs are being loaded and |
| 207 # verification hasn't been disabled above. | 207 # verification hasn't been disabled above. |