summaryrefslogtreecommitdiff
path: root/client/src
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-10-05 18:09:34 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-10-05 18:18:23 -0300
commit2a891aaf38c35534d496b660d71369dd77ff381b (patch)
tree663eb602d0691836fcb77f073a91098117a249d2 /client/src
parent16ca8e6b7514dab3d2135c2c407780761bcd10b7 (diff)
[bug] handle MissingDesignDocError after get_sync_info
MissingDesignDocError raised on get_sync_info due to a missing design document will be handled by the server during sync. Ensure is now False by default, and thus database creation can deliver an empty one that will be ensured during sync, following the ensure parameter.
Diffstat (limited to 'client/src')
-rw-r--r--client/src/leap/soledad/client/sync.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/src/leap/soledad/client/sync.py b/client/src/leap/soledad/client/sync.py
index 225d3e2d..2276db2a 100644
--- a/client/src/leap/soledad/client/sync.py
+++ b/client/src/leap/soledad/client/sync.py
@@ -22,6 +22,7 @@ import logging
from twisted.internet import defer
from u1db import errors
+from leap.soledad.common.errors import MissingDesignDocError
from u1db.sync import Synchronizer
@@ -73,8 +74,9 @@ class SoledadSynchronizer(Synchronizer):
(self.target_replica_uid, target_gen, target_trans_id,
target_my_gen, target_my_trans_id) = yield \
sync_target.get_sync_info(self.source._replica_uid)
- except errors.DatabaseDoesNotExist:
+ except (errors.DatabaseDoesNotExist, MissingDesignDocError) as e:
logger.debug("Database isn't ready on server. Will be created.")
+ logger.debug("Reason: %s", e.__class__)
self.target_replica_uid = None
target_gen, target_trans_id = 0, ''
target_my_gen, target_my_trans_id = 0, ''