Merge lp:~mwhudson/launchpad/ssl-imports-bug-512763 into lp:launchpad

[Michael Hudson-Doyle]

Force bzrlib to use the urllib transport for code imports, which doesn't choke on self signed certificates

[Michael Hudson-Doyle (mwhudson)]

This branch forces bzrlib to use the urllib transport for code imports, which has the happy consequence of not failing on self-signed certificates.

[Aaron Bentley (abentley)]

Please provide the comment on force_bzr_to_use_urllib as a docstring. Otherwise, this looks good to land.

review: Approve

=== modified file 'scripts/code-import-worker.py'
--- scripts/code-import-worker.py	2010-01-31 23:48:38 +0000
+++ scripts/code-import-worker.py	2010-02-03 20:40:32 +0000
@@ -31,6 +31,20 @@
 from canonical.launchpad import scripts
 
 
+def force_bzr_to_use_urllib():
+    """Prevent bzr from using pycurl to connect to http: urls.
+
+    We want this because pycurl rejects self signed certificates, which
+    prevents a significant number of import branchs from updating.  Also see
+    https://bugs.edge.launchpad.net/bzr/+bug/516222.
+    """
+    from bzrlib.transport import register_lazy_transport
+    register_lazy_transport('http://', 'bzrlib.transport.http._urllib',
+                            'HttpTransport_urllib')
+    register_lazy_transport('https://', 'bzrlib.transport.http._urllib',
+                            'HttpTransport_urllib')
+
+
 class CodeImportWorker:
 
     def __init__(self):
@@ -40,6 +54,7 @@
         self.logger = scripts.logger(options, 'code-import-worker')
 
     def main(self):
+        force_bzr_to_use_urllib()
         source_details = CodeImportSourceDetails.fromArguments(self.args)
         if source_details.rcstype == 'git':
             load_optional_plugin('git')