diff options
author | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
commit | 39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch) | |
tree | 8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/storage/prepare_database.py | |
parent | Correctly wire in update group profile over federation (diff) | |
parent | Merge pull request #2568 from matrix-org/rav/pep8 (diff) | |
download | synapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
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 |