summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/soledad/soledadbootstrapper.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-28 13:03:54 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-28 13:03:54 -0300
commit856a3301b025f3d14c36a0ec0c90563358780670 (patch)
tree8193836786a205b19359e696cb357af3d2ac3c29 /src/leap/bitmask/services/soledad/soledadbootstrapper.py
parente149f7e3e6a5c4621edd252fd7f75c580c5e49b3 (diff)
parent4c3329d67ec6730da0b26cc3b57a1ee689560cd0 (diff)
Merge remote-tracking branch 'kali/feature/refactor-mail-connections' into develop
Diffstat (limited to 'src/leap/bitmask/services/soledad/soledadbootstrapper.py')
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 4619ba80..1940fc68 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -25,6 +25,7 @@ from ssl import SSLError
from PySide import QtCore
from u1db import errors as u1db_errors
+from zope.proxy import sameProxiedObjects
from leap.bitmask.config import flags
from leap.bitmask.config.providerconfig import ProviderConfig
@@ -190,7 +191,8 @@ class SoledadBootstrapper(AbstractBootstrapper):
# soledad-launcher in the gui.
raise
- leap_check(self._soledad is not None,
+ leap_assert(sameProxiedObjects(self._soledad, None)
+ is not True,
"Null soledad, error while initializing")
# and now, let's sync