diff options
| author | Kali Kaneko <kali@leap.se> | 2014-11-24 18:43:21 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-11-24 18:43:21 +0100 |
| commit | e232d1aff7d0f0fcd56ae6ce8af43cd5036f3f15 (patch) | |
| tree | 8c36d0795fa2829b271a354c43caa0b56a4be1cb /client/src | |
| parent | ae09eeda9d5d1746a29664fba3c4ca4ddf467459 (diff) | |
| parent | ac9a0212c03cb9e35241b7ce07eb0d0bd64b7879 (diff) | |
Merge branch 'debian/experimental' of ssh://leap.se/soledad into debian/experimental
Conflicts:
client/pkg/requirements.pip
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/leap/soledad/client/sqlcipher.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py index 2df9606e..41707953 100644 --- a/client/src/leap/soledad/client/sqlcipher.py +++ b/client/src/leap/soledad/client/sqlcipher.py @@ -238,7 +238,10 @@ class SQLCipherDatabase(sqlite_backend.SQLitePartialExpandDatabase): self._pragma_synchronous_normal(self._db_handle) if os.environ.get('LEAP_SQLITE_MEMSTORE'): self._pragma_mem_temp_store(self._db_handle) - self._pragma_write_ahead_logging(self._db_handle) + + # Disabled for 0.6.x branch. See #5562 + # self._pragma_write_ahead_logging(self._db_handle) + self._real_replica_uid = None self._ensure_schema() self._crypto = crypto |