Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/url.py @ 13544:66d65bccbf06 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cacert: improve error report when web.cacert file does not exist
author timeless <timeless@gmail.com>
date Sun, 06 Mar 2011 10:27:07 -0600
parents 08f9c587141f
children 4e8f2310f310 a3403d5b0af3
comparison
equal deleted inserted replaced
13543:c17e4d881722 13544:66d65bccbf06
558 558
559 cacerts = self.ui.config('web', 'cacerts') 559 cacerts = self.ui.config('web', 'cacerts')
560 hostfingerprint = self.ui.config('hostfingerprints', host) 560 hostfingerprint = self.ui.config('hostfingerprints', host)
561 561
562 if cacerts and not hostfingerprint: 562 if cacerts and not hostfingerprint:
563 cacerts = util.expandpath(cacerts)
564 if not os.path.exists(cacerts):
565 raise util.Abort(_('could not find '
566 'web.cacerts: %s') % cacerts)
563 self.sock = _ssl_wrap_socket(self.sock, self.key_file, 567 self.sock = _ssl_wrap_socket(self.sock, self.key_file,
564 self.cert_file, cert_reqs=CERT_REQUIRED, 568 self.cert_file, cert_reqs=CERT_REQUIRED,
565 ca_certs=util.expandpath(cacerts)) 569 ca_certs=cacerts)
566 msg = _verifycert(self.sock.getpeercert(), host) 570 msg = _verifycert(self.sock.getpeercert(), host)
567 if msg: 571 if msg:
568 raise util.Abort(_('%s certificate error: %s ' 572 raise util.Abort(_('%s certificate error: %s '
569 '(use --insecure to connect ' 573 '(use --insecure to connect '
570 'insecurely)') % (host, msg)) 574 'insecurely)') % (host, msg))