summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-19 13:03:46 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-19 13:03:46 -0300
commit8efd282e38331c0decdf7d035ed3a174d1ff55cd (patch)
treed770851337405723d9696f273cc14c783bb631d5 /src
parentd51d6bedfecd41491f2c8243235e7d3db043a4d7 (diff)
parentd6786aabd5af26dcc949f97174d5bdbd103277c1 (diff)
Merge remote-tracking branch 'drebs/bug/4537_fix-bootstrap-subtasks-order-and-key-upload' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index e8c7e9ce..d078ae96 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -196,7 +196,7 @@ class SoledadBootstrapper(AbstractBootstrapper):
leap_assert(not sameProxiedObjects(self._soledad, None),
"Null soledad, error while initializing")
- self.deferred = deferToThread(self._do_soledad_sync)
+ self._do_soledad_sync()
def _do_soledad_sync(self):
"""