diff options
| author | Kali Kaneko <kali@leap.se> | 2015-09-29 10:42:51 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-09-29 10:42:51 -0400 |
| commit | bdaa25d6296cee24f126de54078ddef9c0273c20 (patch) | |
| tree | aaf640bc1fe6278add801e6829e337468c45b4e3 /client | |
| parent | b56d8db6e5dee0eccfa5c5a43c2e1b744a4eceac (diff) | |
| parent | 4de93f472ac224ef32beffa1acd1c98765519160 (diff) | |
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/leap/soledad/client/sync.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/client/src/leap/soledad/client/sync.py b/client/src/leap/soledad/client/sync.py index 110baa0a..225d3e2d 100644 --- a/client/src/leap/soledad/client/sync.py +++ b/client/src/leap/soledad/client/sync.py @@ -69,9 +69,15 @@ class SoledadSynchronizer(Synchronizer): # get target identifier, its current generation, # and its last-seen database generation for this source ensure_callback = None - (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) + try: + (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: + logger.debug("Database isn't ready on server. Will be created.") + self.target_replica_uid = None + target_gen, target_trans_id = 0, '' + target_my_gen, target_my_trans_id = 0, '' logger.debug( "Soledad target sync info:\n" |