summary refs log tree commit diff
path: root/scripts/synapse_port_db
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-24 11:23:49 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-24 11:23:49 +0100
commit3ad359e5becf7834fad3034a8d18f61206ede8f1 (patch)
tree741c28822a3b5e26d229be68bc06c95a25218748 /scripts/synapse_port_db
parentAllow backslashes in event field filters (diff)
parentMerge pull request #4082 from matrix-org/rav/fix_pep8 (diff)
downloadsynapse-3ad359e5becf7834fad3034a8d18f61206ede8f1.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
Diffstat (limited to 'scripts/synapse_port_db')
-rwxr-xr-xscripts/synapse_port_db3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db

index 2f6e69e552..3c7b606323 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db
@@ -501,7 +501,8 @@ class Porter(object): try: yield self.postgres_store.runInteraction("alter_table", alter_table) - except Exception as e: + except Exception: + # On Error Resume Next pass yield self.postgres_store.runInteraction(