diff options
| author | drebs <drebs@leap.se> | 2013-01-09 11:46:58 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-09 11:46:58 -0200 |
| commit | 9b7728b80027f35c013a449b884235cf8eac503c (patch) | |
| tree | 70f96686158c9704bf7a17534d03cdde14c6b01c /src/leap/soledad/backends/couch.py | |
| parent | a59b34f37fb687de77d1a94f41f53a961baad348 (diff) | |
CouchDatabase passes u1db LocalDatabaseTests.
Diffstat (limited to 'src/leap/soledad/backends/couch.py')
| -rw-r--r-- | src/leap/soledad/backends/couch.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/leap/soledad/backends/couch.py b/src/leap/soledad/backends/couch.py index 8603a36b..14021737 100644 --- a/src/leap/soledad/backends/couch.py +++ b/src/leap/soledad/backends/couch.py @@ -58,6 +58,8 @@ class CouchDatabase(ObjectStore): generation = self._get_generation() results = [] for doc_id in self._database: + if doc_id == self.U1DB_DATA_DOC_ID: + continue doc = self._get_doc(doc_id) if doc.content is None and not include_deleted: continue @@ -106,13 +108,15 @@ class CouchDatabase(ObjectStore): content = json.loads(cdoc['u1db_json']) self._sync_log.log = content['sync_log'] self._transaction_log.log = content['transaction_log'] + self._conflict_log.log = content['conflict_log'] self._replica_uid = content['replica_uid'] self._couch_rev = cdoc['_rev'] def _set_u1db_data(self): doc = self._factory(doc_id=self.U1DB_DATA_DOC_ID) - doc.content = { 'transaction_log' : self._transaction_log.log, - 'sync_log' : self._sync_log.log, + doc.content = { 'sync_log' : self._sync_log.log, + 'transaction_log' : self._transaction_log.log, + 'conflict_log' : self._conflict_log.log, 'replica_uid' : self._replica_uid, '_rev' : self._couch_rev} self._put_doc(doc) |