Rev 6464: We need a clearer understanding of ssl errors. in file:///home/vila/src/bzr/bugs/920455-ssl-defaults/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/920455-ssl-defaults/

------------------------------------------------------------
revno: 6464
revision-id: v.ladeuil+lp at free.fr-20120131170022-gbthyl1gbocu3s5m
parent: v.ladeuil+lp at free.fr-20120131163653-j5z45vjfx8a6h2d0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 920455-ssl-defaults
timestamp: Tue 2012-01-31 18:00:22 +0100
message:
  We need a clearer understanding of ssl errors.
-------------- next part --------------
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2012-01-31 16:36:53 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2012-01-31 17:00:22 +0000
@@ -488,11 +488,12 @@
             ssl_sock = ssl.wrap_socket(self.sock, self.key_file, self.cert_file,
                 cert_reqs=cert_reqs, ca_certs=ca_certs)
         except ssl.SSLError, e:
-            if e.errno == ssl.SSL_ERROR_SSL:
-                trace.note(
-                    "To disable SSL certificate verification, use "
-                    "-Ossl.cert_reqs=none. See ``bzr help ssl.ca_certs`` for "
-                    "more information on specifying trusted CAs.")
+            trace.note(
+                "\n"
+                "See `bzr help ssl.ca_certs` for how to specify trusted CA"
+                "certificates.\n"
+                "Pass -Ossl.cert_reqs=none to disable certificate "
+                "verification entirely.\n")
             raise
         if cert_reqs == ssl.CERT_REQUIRED:
             peer_cert = ssl_sock.getpeercert()