summaryrefslogtreecommitdiff
path: root/client/src/leap
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-05-20 10:58:16 -0300
committerdrebs <drebs@leap.se>2015-05-20 11:37:30 -0300
commitd59ac3b5ce713787cd7a46e181f2381de3a8fde2 (patch)
treee4a6b5e923dab2f93428e2736dcfe83e2f71c4a1 /client/src/leap
parentec55459fa697f5d8676e16e5fee8a0c0f75c8c2c (diff)
[feature] ensure reactor stops on client db script
Diffstat (limited to 'client/src/leap')
-rw-r--r--client/src/leap/soledad/client/encdecpool.py9
-rw-r--r--client/src/leap/soledad/client/sqlcipher.py1
2 files changed, 5 insertions, 5 deletions
diff --git a/client/src/leap/soledad/client/encdecpool.py b/client/src/leap/soledad/client/encdecpool.py
index 7c21c30e..02eeb590 100644
--- a/client/src/leap/soledad/client/encdecpool.py
+++ b/client/src/leap/soledad/client/encdecpool.py
@@ -766,11 +766,12 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
# wait until we know how many documents we need to process
while self._docs_to_process is None:
time.sleep(self.DECRYPT_LOOP_PERIOD)
- # because all database operations are asynchronous, we use an event to
- # make sure we don't start the next loop before the current one has
- # finished.
+ # because all database operations are asynchronous, we use an
+ # event to make sure we don't start the next loop before the
+ # current one has finished.
event = threading.Event()
- # loop until we have processes as many docs as the number of changes
+ # loop until we have processes as many docs as the number of
+ # changes
while self._processed_docs < self._docs_to_process:
if sameProxiedObjects(
self._insert_doc_cb.get(self.source_replica_uid),
diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py
index 7fde9a7c..96732325 100644
--- a/client/src/leap/soledad/client/sqlcipher.py
+++ b/client/src/leap/soledad/client/sqlcipher.py
@@ -653,7 +653,6 @@ class SQLCipherU1DBSync(SQLCipherDatabase):
# Symmetric encryption of syncing docs
#
-
def get_generation(self):
# FIXME
# XXX this SHOULD BE a callback