summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-10-24 16:25:39 +0100
committerNeil Johnson <neil@matrix.org>2018-10-24 16:25:39 +0100
commit07126e43a4db2d898e015186902031c8311093cb (patch)
tree56c45f6cafd6ceaae2341b07de65c294327cd365 /scripts
parentremove white space (diff)
parentfix branch regexp (diff)
downloadsynapse-07126e43a4db2d898e015186902031c8311093cb.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
Diffstat (limited to 'scripts')
-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(