diff options
author | Kali Kaneko <kali@leap.se> | 2013-09-19 15:50:43 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-09-19 15:50:43 -0400 |
commit | 1c194fe4b5d7b43097c31331cc8a7162bfbef4be (patch) | |
tree | dd2f1e7901993208a00055e1f31595849d41eb51 /src/leap/bitmask/config/providerconfig.py | |
parent | 006f362af526e9283c698805100e54c18b2be390 (diff) | |
parent | 6cd19c3b67d76268bab5f93d3168164ec02f603d (diff) |
Merge remote-tracking branch 'ivan-github/feature/standalone-flag-to-module' into develop
Diffstat (limited to 'src/leap/bitmask/config/providerconfig.py')
-rw-r--r-- | src/leap/bitmask/config/providerconfig.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py index a7808399..c8c8a59e 100644 --- a/src/leap/bitmask/config/providerconfig.py +++ b/src/leap/bitmask/config/providerconfig.py @@ -21,10 +21,11 @@ Provider configuration import logging import os -from leap.bitmask.config.provider_spec import leap_provider_spec from leap.common.check import leap_check from leap.common.config.baseconfig import BaseConfig, LocalizedKey +from leap.bitmask.config.provider_spec import leap_provider_spec from leap.bitmask.services import get_service_display_name +from leap.bitmask.util import get_path_prefix logger = logging.getLogger(__name__) @@ -151,13 +152,9 @@ class ProviderConfig(BaseConfig): :type about_to_download: bool """ - cert_path = os.path.join(self.get_path_prefix(), - "leap", - "providers", + cert_path = os.path.join(get_path_prefix(), "leap", "providers", self.get_domain(), - "keys", - "ca", - "cacert.pem") + "keys", "ca", "cacert.pem") if not about_to_download: cert_exists = os.path.exists(cert_path) |