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
commit2c4e01ac5ea9870c39ab26bebe82cca2f25f04d1 (patch)
tree2a059301ff45f4bff04ddc346880b75f1b396929
parent79971e7c2b26e0dd34462aae8c732029c2701cd9 (diff)
parentda881bd0bd446c77503adfd07f23bbdb9654a52f (diff)
Merge remote-tracking branch 'chiiph/bug/safe_soledad_list_indexes' into develop
-rw-r--r--src/leap/mail/imap/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py
index a69eb3f..cfcb3d6 100644
--- a/src/leap/mail/imap/server.py
+++ b/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.