diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-13 13:19:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-13 13:29:02 +0100 |
| commit | f9340ea0d5346bb07489b1bd03bb90ea8f437e42 (patch) | |
| tree | 3cb14e0a740aa768df674d08bb51c53970a215cb /synapse/app/homeserver.py | |
| parent | Search left rooms too (diff) | |
| parent | Expose error more nicely (diff) | |
| download | synapse-f9340ea0d5346bb07489b1bd03bb90ea8f437e42.tar.xz | |
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 190b03e2f7..b284d07cf0 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -35,9 +35,8 @@ if __name__ == '__main__': from synapse.storage.engines import create_engine, IncorrectDatabaseSetup -from synapse.storage import ( - are_all_users_on_domain, UpgradeDatabaseException, -) +from synapse.storage import are_all_users_on_domain +from synapse.storage.schema_prepare import UpgradeDatabaseException from synapse.server import HomeServer |