~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-02-22 11:29:06 UTC
mfrom: (6437.34.1 trivial_win32_cert_bundle_name)
mto: (6472.1.1 merge-2.5) (6437.54.1 2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6473.
Revision ID: pqm@pqm.ubuntu.com-20120222112906-4vt2lbeqntack3cz

(gz) Use 'cacert.pem' as name for default certificate bundle on win32
(Martin Packman)

added added

removed removed

]

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