summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-08-28 18:13:06 -0400
committerVarac <varac@leap.se>2017-08-30 20:41:50 +0200
commitcf0630ad0ac2923270fab09f82a1a3ff277c9c7e (patch)
tree5156fb27028ae5764f8247602a319e58719b4f9f /src/leap/bitmask
parent3dcb9e6b70b3f177b135e1086f58791a9a5c7bc9 (diff)
[bug] fail gracefully if cannot import soledad
- Resolves: #9025
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/core/mail_services.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index 6a53eac1..f159ca14 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -48,6 +48,7 @@ try:
from leap.bitmask.mail.smtp import service as smtp_service
from leap.bitmask.mail.incoming.service import IncomingMail
from leap.bitmask.mail.incoming.service import INCOMING_CHECK_PERIOD
+ from leap.soledad.client.api import Soledad
HAS_MAIL = True
except ImportError:
HAS_MAIL = False
@@ -58,8 +59,6 @@ try:
except ImportError:
HAS_MUA = False
-from leap.soledad.client.api import Soledad
-
from leap.bitmask.core.uuid_map import UserMap
from leap.bitmask.core.configurable import DEFAULT_BASEDIR