summaryrefslogtreecommitdiff
path: root/src/leap/keymanager
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-09-02 09:28:50 -0300
committerTomás Touceda <chiiph@leap.se>2013-09-02 09:28:50 -0300
commitd74830c0268a98f44927bac8ba53e93852226cd9 (patch)
tree575e146ba3710feb9c3489227fc613d836b46daf /src/leap/keymanager
parentcd5e297c2abdb082c10161f256c286b8216de883 (diff)
parent701632bfd4fcb2c2d0e3231ad8dd5f188333df13 (diff)
Merge remote-tracking branch 'kali/bug/assert_nonnull_soledad' into develop
Diffstat (limited to 'src/leap/keymanager')
-rw-r--r--src/leap/keymanager/keys.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/leap/keymanager/keys.py b/src/leap/keymanager/keys.py
index 1c33745..b8e88d4 100644
--- a/src/leap/keymanager/keys.py
+++ b/src/leap/keymanager/keys.py
@@ -219,6 +219,8 @@ class EncryptionScheme(object):
"""
Initialize the database indexes.
"""
+ leap_assert(self._soledad is not None,
+ "Cannot init indexes with null soledad")
# Ask the database for currently existing indexes.
db_indexes = dict(self._soledad.list_indexes())
# Loop through the indexes we expect to find.