summaryrefslogtreecommitdiff
diff options
authorJeff Lane <jeffrey.lane@canonical.com>2017-03-27 17:12:10 -0400
committerSylvain Pineau <sylvain.pineau@canonical.com>2017-04-03 09:39:22 +0200
commitdf9b7d8250e07c3acb664808bf66dc143389cadd (patch)
tree6725ee5e92514dd58443a733dfa77da682e0cbe4
parent5584978f6852044e56e57f7acdae4539a29ff95e (diff)
Back out use of NewConnectionError which does not exist in the Trusty version of urllib3, causing script to break on Trusty LP: #1676585
-rwxr-xr-xbin/virtualization5
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/virtualization b/bin/virtualization
index ff11061..e221261 100755
--- a/bin/virtualization
+++ b/bin/virtualization
@@ -31,7 +31,6 @@ import re
import logging
import lsb_release
import requests
-from requests.packages.urllib3.exceptions import NewConnectionError
import shlex
import signal
from subprocess import (
@@ -250,9 +249,9 @@ class KVMTest(object):
# test our URL to make sure it's reachable
try:
ret = requests.head(url)
- except (OSError, NewConnectionError) as e:
+ except OSError as e:
logging.error("Unable to connect to {}".format(url))
- logging.error(e)
+ logging.error(" * Message: {}".format(e.with_traceback(None)))
return False
if ret.status_code is not 200: