diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
| commit | f009df23ec711e943d958bb0a0e3185d42d7cc79 (patch) | |
| tree | 30fa4558fe72f9429b0d533d12653dc786ad9692 /synapse/storage/prepare_database.py | |
| parent | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-0.24.1.tar.xz | |
Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1
Diffstat (limited to 'synapse/storage/prepare_database.py')
| -rw-r--r-- | synapse/storage/prepare_database.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py index ccaaabcfa0..817c2185c8 100644 --- a/synapse/storage/prepare_database.py +++ b/synapse/storage/prepare_database.py @@ -66,7 +66,7 @@ def prepare_database(db_conn, database_engine, config): cur.close() db_conn.commit() - except: + except Exception: db_conn.rollback() raise |