openstack
/
glance_store
Code Issues Proposed changes

Merge "Fix some Exceptions incompatibilities"

This commit is contained in:
Jenkins 2014-07-30 08:56:39 +00:00 committed by Gerrit Code Review
parent 8cdfcb8416 b31b2dab87
commit fe729b10a5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glance/store/backend.py
View File

@ -336,7 +336,9 @@ def store_add_to_backend(image_id, data, size, store, context=None):
except exceptions.BackendException as e:
e_msg = (_("A bad metadata structure was returned from the "
"%(driver)s storage driver: %(metadata)s. %(e)s.") %
dict(driver=str(store), metadata=str(metadata), e=str(e)))
dict(driver=unicode(store),
metadata=unicode(metadata),
e=unicode(e)))
LOG.error(e_msg)
raise exceptions.BackendException(e_msg)
return (location, size, checksum, metadata)

2
glance/store/exceptions.py
View File

@ -38,7 +38,7 @@ class GlanceStoreException(Exception):
def __init__(self, **kwargs):
msg = kwargs.pop('message', None)
msg = msg or self.message.format(**kwargs)
self.msg = msg or self.message.format(**kwargs)
super(Exception, self).__init__(msg)