summary refs log tree commit diff
path: root/synapse/storage/schema/delta/30/as_users.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-24 15:02:25 +0100
committerErik Johnston <erik@matrix.org>2017-10-24 15:02:25 +0100
commitf009df23ec711e943d958bb0a0e3185d42d7cc79 (patch)
tree30fa4558fe72f9429b0d533d12653dc786ad9692 /synapse/storage/schema/delta/30/as_users.py
parentMerge branch 'release-v0.24.0' of github.com:matrix-org/synapse (diff)
parentBump version and changelog (diff)
downloadsynapse-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/schema/delta/30/as_users.py')
-rw-r--r--synapse/storage/schema/delta/30/as_users.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/schema/delta/30/as_users.py b/synapse/storage/schema/delta/30/as_users.py

index 5b7d8d1ab5..c53e53c94f 100644 --- a/synapse/storage/schema/delta/30/as_users.py +++ b/synapse/storage/schema/delta/30/as_users.py
@@ -22,7 +22,7 @@ def run_create(cur, database_engine, *args, **kwargs): # NULL indicates user was not registered by an appservice. try: cur.execute("ALTER TABLE users ADD COLUMN appservice_id TEXT") - except: + except Exception: # Maybe we already added the column? Hope so... pass