From cf0630ad0ac2923270fab09f82a1a3ff277c9c7e Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 28 Aug 2017 18:13:06 -0400 Subject: [bug] fail gracefully if cannot import soledad - Resolves: #9025 --- src/leap/bitmask/core/mail_services.py | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3