summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/mail
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/services/mail
parent2cb7443595a91857a4d037f2385ade5c8385d6a4 (diff)
parent4756aee1aa279bbce951b715a84dbb3d2f8d3173 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/4986_error-joining-string' into develop
Diffstat (limited to 'src/leap/bitmask/services/mail')
-rw-r--r--src/leap/bitmask/services/mail/plumber.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/leap/bitmask/services/mail/plumber.py b/src/leap/bitmask/services/mail/plumber.py
index 49514655..07a2608c 100644
--- a/src/leap/bitmask/services/mail/plumber.py
+++ b/src/leap/bitmask/services/mail/plumber.py
@@ -17,8 +17,8 @@
"""
Utils for manipulating local mailboxes.
"""
-import logging
import getpass
+import logging
import os
from collections import defaultdict
@@ -28,8 +28,9 @@ from twisted.internet import defer
from leap.bitmask.config.leapsettings import LeapSettings
from leap.bitmask.config.providerconfig import ProviderConfig
-from leap.bitmask.util import flatten, get_path_prefix
+from leap.bitmask.provider import get_provider_path
from leap.bitmask.services.soledad.soledadbootstrapper import get_db_paths
+from leap.bitmask.util import flatten, get_path_prefix
from leap.mail.imap.account import SoledadBackedAccount
from leap.soledad.client import Soledad
@@ -112,10 +113,8 @@ class MBOXPlumber(object):
self.sol = None
self._settings = LeapSettings()
- provider_config_path = os.path.join(
- get_path_prefix(),
- "leap", "providers",
- provider, "provider.json")
+ provider_config_path = os.path.join(get_path_prefix(),
+ get_provider_path(provider))
provider_config = ProviderConfig()
loaded = provider_config.load(provider_config_path)
if not loaded: