Rev 6478: (gz) Use 'cacert.pem' as name for default certificate bundle on win32 in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6478 [merge]
revision-id: pqm at pqm.ubuntu.com-20120222112906-4vt2lbeqntack3cz
parent: pqm at pqm.ubuntu.com-20120221101358-9cdw1ica619x0n62
parent: martin.packman at canonical.com-20120221121602-zwx3b8adwwqlzn2k
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Wed 2012-02-22 11:29:06 +0000
message:
  (gz) Use 'cacert.pem' as name for default certificate bundle on win32
   (Martin Packman)
modified:
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2012-02-15 10:24:06 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2012-02-21 12:16:02 +0000
@@ -88,7 +88,7 @@
     ]
 def default_ca_certs():
     if sys.platform == 'win32':
-        return os.path.join(os.path.dirname(sys.executable), u"ca_bundle.crt")
+        return os.path.join(os.path.dirname(sys.executable), u"cacert.pem")
     elif sys.platform == 'darwin':
         # FIXME: Needs some default value for osx, waiting for osx installers
         # guys feedback -- vila 2012-01-25