From 7c2a489725293bba7de8b8238fb1c5c7f1e30a47 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Fri, 21 Oct 2016 17:04:04 -0400 Subject: [bug] fail gracefully if cannot find cert file --- src/leap/bitmask/keymanager/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/leap/bitmask/keymanager') diff --git a/src/leap/bitmask/keymanager/__init__.py b/src/leap/bitmask/keymanager/__init__.py index be3730a..3798ce0 100644 --- a/src/leap/bitmask/keymanager/__init__.py +++ b/src/leap/bitmask/keymanager/__init__.py @@ -98,7 +98,12 @@ class KeyManager(object): self.uid = uid self._openpgp = OpenPGPScheme(soledad, gpgbinary=gpgbinary) create = self._create_combined_bundle_file - self._combined_ca_bundle = combined_ca_bundle or create() + try: + self._combined_ca_bundle = combined_ca_bundle or create() + except Exception: + logger.warn('error while creating combined ca bundle') + self._combined_ca_bundle = '' + self._async_client = HTTPClient(self._combined_ca_bundle) self._async_client_pinned = HTTPClient(self._ca_cert_path) -- cgit v1.2.3