summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-23 11:43:23 +0200
committerKali Kaneko <kali@leap.se>2013-08-23 11:43:23 +0200
commit7af87f588cd384455f8df77be188bf52ab33d045 (patch)
tree375914013ba9188affec2c787a1abb7e0d0c8af9
parentcf2afc254f7c6f8ac67b83c417b17ca4891a6059 (diff)
parent64e978ba6b064057f0feb00f0a58a0bb2ac034ad (diff)
Merge remote-tracking branch 'chiiph/bug/safe_soledad_list_indexes' into develop
-rw-r--r--mail/src/leap/mail/imap/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mail/src/leap/mail/imap/server.py b/mail/src/leap/mail/imap/server.py
index a69eb3fc..cfcb3d6d 100644
--- a/mail/src/leap/mail/imap/server.py
+++ b/mail/src/leap/mail/imap/server.py
@@ -123,7 +123,9 @@ class IndexedDB(object):
if not self._soledad:
logger.debug("NO SOLEDAD ON IMAP INITIALIZATION")
return
- db_indexes = dict(self._soledad.list_indexes())
+ db_indexes = dict()
+ if self._soledad is not None:
+ db_indexes = dict(self._soledad.list_indexes())
for name, expression in SoledadBackedAccount.INDEXES.items():
if name not in db_indexes:
# The index does not yet exist.