openstack
/
glance
Code Issues Proposed changes

Merge "Remove Swift location/password from messages." into stable/folsom

This commit is contained in:
Jenkins 2013-01-29 15:57:58 +00:00 committed by Gerrit Code Review
parent 0e4e7a7312 96a470be64
commit a5b0f4eb81
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
glance/store/swift.py
View File

@ -136,7 +136,7 @@ class StoreLocation(glance.store.location.StoreLocation):
"like so: "
"swift+http://user:pass@authurl.com/v1/container/obj"
)
LOG.error(_("Invalid store uri %(uri)s: %(reason)s") % locals())
LOG.error(_("Invalid store URI: %(reason)s") % locals())
raise exception.BadStoreUri(message=reason)
pieces = urlparse.urlparse(uri)
@ -162,8 +162,7 @@ class StoreLocation(glance.store.location.StoreLocation):
if creds:
cred_parts = creds.split(':')
if len(cred_parts) != 2:
reason = (_("Badly formed credentials '%(creds)s' in Swift "
"URI") % locals())
reason = (_("Badly formed credentials in Swift URI."))
LOG.error(reason)
raise exception.BadStoreUri()
user, key = cred_parts
@ -181,7 +180,7 @@ class StoreLocation(glance.store.location.StoreLocation):
path_parts.insert(0, netloc)
self.auth_or_store_url = '/'.join(path_parts)
except IndexError:
reason = _("Badly formed Swift URI: %s") % uri
reason = _("Badly formed Swift URI.")
LOG.error(reason)
raise exception.BadStoreUri()
@ -293,8 +292,8 @@ class Store(glance.store.base.Store):
except swiftclient.ClientException, e:
if e.http_status == httplib.NOT_FOUND:
uri = location.get_store_uri()
raise exception.NotFound(_("Swift could not find image at "
"uri %(uri)s") % locals())
msg = _("Swift could not find image at URI.")
raise exception.NotFound(msg)
else:
raise
@ -543,7 +542,7 @@ class Store(glance.store.base.Store):
except swiftclient.ClientException, e:
if e.http_status == httplib.CONFLICT:
raise exception.Duplicate(_("Swift already has an image at "
"location %s") % location.get_uri())
"this location."))
msg = (_("Failed to add object to Swift.\n"
"Got error from Swift: %(e)s") % locals())
LOG.error(msg)
@ -596,8 +595,8 @@ class Store(glance.store.base.Store):
except swiftclient.ClientException, e:
if e.http_status == httplib.NOT_FOUND:
uri = location.get_store_uri()
raise exception.NotFound(_("Swift could not find image at "
"uri %(uri)s") % locals())
msg = _("Swift could not find image at URI.")
raise exception.NotFound(msg)
else:
raise
@ -637,8 +636,8 @@ class Store(glance.store.base.Store):
except swiftclient.ClientException, e:
if e.http_status == httplib.NOT_FOUND:
uri = location.get_store_uri()
raise exception.NotFound(_("Swift could not find image at "
"uri %(uri)s") % locals())
msg = _("Swift could not find image at URI.")
raise exception.NotFound(msg)
else:
raise