From 592ba14b36bca88aa4517aa4885f89a706cc3b06 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 16 Dec 2014 14:07:05 +0000
Subject: [PATCH] Fix bugs in upgrade script.

Handle the case when there are colons in server_name. Handle http
exceptions more gracefully.
---
 scripts/upgrade_db_to_v0.6.0.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade_db_to_v0.6.0.py b/scripts/upgrade_db_to_v0.6.0.py
index 5f6fa3a5aa..8f371bb4bb 100644
--- a/scripts/upgrade_db_to_v0.6.0.py
+++ b/scripts/upgrade_db_to_v0.6.0.py
@@ -21,6 +21,7 @@ from syutil.jsonutil import encode_canonical_json
 import argparse
 import dns.resolver
 import hashlib
+import httplib
 import json
 import sqlite3
 import syutil
@@ -150,7 +151,6 @@ def get_key(server_name):
     if ":" in server_name:
         target, port = server_name.split(":")
         targets.append((target, int(port)))
-        return
     try:
         answers = dns.resolver.query("_matrix._tcp." + server_name, "SRV")
         for srv in answers:
@@ -176,6 +176,10 @@ def get_key(server_name):
             return verify_keys
         except urllib2.URLError:
             pass
+        except urllib2.HTTPError:
+            pass
+        except httplib.HTTPException:
+            pass
 
     print "Failed to get keys for %s" % (server_name,)
     return {}