summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/config/providerconfig.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-24 14:19:02 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-24 14:19:02 -0300
commit8f849704c65ed0c4e61a5fb49e1909d7b3b0d684 (patch)
tree0b3a4c81cf59a087fa0708ea24537ad272f0f984 /src/leap/bitmask/config/providerconfig.py
parent2cb7443595a91857a4d037f2385ade5c8385d6a4 (diff)
parent4756aee1aa279bbce951b715a84dbb3d2f8d3173 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/4986_error-joining-string' into develop
Diffstat (limited to 'src/leap/bitmask/config/providerconfig.py')
-rw-r--r--src/leap/bitmask/config/providerconfig.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index e80b2337..2ebe05ce 100644
--- a/src/leap/bitmask/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
@@ -21,11 +21,12 @@ Provider configuration
import logging
import os
-from leap.common.check import leap_check
-from leap.common.config.baseconfig import BaseConfig, LocalizedKey
+from leap.bitmask import provider
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
+from leap.common.check import leap_check
+from leap.common.config.baseconfig import BaseConfig, LocalizedKey
logger = logging.getLogger(__name__)
@@ -55,10 +56,7 @@ class ProviderConfig(BaseConfig):
:rtype: ProviderConfig or None if there is a problem loading the config
"""
provider_config = ProviderConfig()
- provider_config_path = os.path.join(
- "leap", "providers", domain, "provider.json")
-
- if not provider_config.load(provider_config_path):
+ if not provider_config.load(provider.get_provider_path(domain)):
provider_config = None
return provider_config