From 3a95d451edfa622b987cdc8f904cd00262f32cea Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Wed, 15 Feb 2012 17:38:05 +0000 Subject: Catch httplib.HTTPException as well Fixes bug 932927 None of the httplib exceptions will get converted into urllib2 exceptions Change-Id: Iad72821fa1ed54fdb213b371223e94e183dec334 --- plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins') diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index 35f60923c..134840335 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -93,6 +93,10 @@ def _download_tarball(request, staging_path): raise RetryException(error) except urllib2.URLError, error: raise RetryException(error) + except httplib.HTTPException, error: + # httplib.HTTPException and derivatives (BadStatusLine in particular) + # don't have a useful __repr__ or __str__ + raise RetryException('%s: %s' % (error.__class__.__name__, error)) tar_cmd = "tar -zx --directory=%(staging_path)s" % locals() tar_proc = _make_subprocess(tar_cmd, stderr=True, stdin=True) -- cgit