diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-03-14 11:41:55 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-03-14 11:41:55 -0300 |
| commit | e51d656532294fa1bdf2a78ccd8426ccb97dd07c (patch) | |
| tree | eeb21d98a7f37248fd6db5787fe350a55017a0ca /server | |
| parent | 9c0020132980ed3608f3d662f2a0df43d44dc042 (diff) | |
| parent | b85c9797827731b86798adc958cee0c114667918 (diff) | |
Merge remote-tracking branch 'refs/remotes/drebs/feature/5302_do-not-try-to-create-db-when-syncing' into develop
Diffstat (limited to 'server')
| -rw-r--r-- | server/changes/feature_5302_do-not-ensure-shared-database | 2 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/changes/feature_5302_do-not-ensure-shared-database b/server/changes/feature_5302_do-not-ensure-shared-database new file mode 100644 index 00000000..4ee70b9a --- /dev/null +++ b/server/changes/feature_5302_do-not-ensure-shared-database @@ -0,0 +1,2 @@ + o Do not try to create the shared database when running the Soledad Server + application (#5302). diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 84f6a849..c170f230 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -144,8 +144,6 @@ class SoledadApp(http_app.HTTPApp): @return: HTTP application results. @rtype: list """ - # ensure the shared database exists - self.state.ensure_database(self.SHARED_DB_NAME) return http_app.HTTPApp.__call__(self, environ, start_response) |