diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-24 14:19:02 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-24 14:19:02 -0300 |
| commit | 8f849704c65ed0c4e61a5fb49e1909d7b3b0d684 (patch) | |
| tree | 0b3a4c81cf59a087fa0708ea24537ad272f0f984 /src/leap/bitmask/backend.py | |
| parent | 2cb7443595a91857a4d037f2385ade5c8385d6a4 (diff) | |
| parent | 4756aee1aa279bbce951b715a84dbb3d2f8d3173 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/4986_error-joining-string' into develop
Diffstat (limited to 'src/leap/bitmask/backend.py')
| -rw-r--r-- | src/leap/bitmask/backend.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend.py index 6b29d4b3..df79381c 100644 --- a/src/leap/bitmask/backend.py +++ b/src/leap/bitmask/backend.py @@ -18,7 +18,6 @@ Backend for everything """ import logging -import os from Queue import Queue, Empty @@ -29,6 +28,7 @@ from twisted.python import log import zope.interface from leap.bitmask.config.providerconfig import ProviderConfig +from leap.bitmask.provider import get_provider_path from leap.bitmask.provider.providerbootstrapper import ProviderBootstrapper # Frontend side @@ -155,9 +155,7 @@ class Provider(object): # we want to connect to other provider... if (not self._provider_config.loaded() or self._provider_config.get_domain() != provider): - self._provider_config.load( - os.path.join("leap", "providers", - provider, "provider.json")) + self._provider_config.load(get_provider_path(provider)) if self._provider_config.loaded(): d = self._provider_bootstrapper.run_provider_setup_checks( |