Merge "Fix glanceclient http.py string formatting error"

This commit is contained in:
Jenkins
2014-01-09 17:50:06 +00:00
committed by Gerrit Code Review
2 changed files with 19 additions and 1 deletions
+2 -1
View File
@@ -435,7 +435,8 @@ class VerifiedHTTPSConnection(HTTPSConnection):
try:
self.context.load_verify_locations(self.cacert)
except Exception as e:
msg = 'Unable to load CA from "%s"' % (self.cacert, e)
msg = ('Unable to load CA from "%(cacert)s" %(exc)s' %
dict(cacert=self.cacert, exc=e))
raise exc.SSLConfigurationError(msg)
else:
self.context.set_default_verify_paths()