Fix some Exceptions incompatibilities
Change-Id: I1f2387dc2655dee47a98cb507428a472b24c7a51
This commit is contained in:
parent
0937a9ae6e
commit
b31b2dab87
@ -336,7 +336,9 @@ def store_add_to_backend(image_id, data, size, store, context=None):
|
|||||||
except exceptions.BackendException as e:
|
except exceptions.BackendException as e:
|
||||||
e_msg = (_("A bad metadata structure was returned from the "
|
e_msg = (_("A bad metadata structure was returned from the "
|
||||||
"%(driver)s storage driver: %(metadata)s. %(e)s.") %
|
"%(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)
|
LOG.error(e_msg)
|
||||||
raise exceptions.BackendException(e_msg)
|
raise exceptions.BackendException(e_msg)
|
||||||
return (location, size, checksum, metadata)
|
return (location, size, checksum, metadata)
|
||||||
|
@ -38,7 +38,7 @@ class GlanceStoreException(Exception):
|
|||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
msg = kwargs.pop('message', None)
|
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)
|
super(Exception, self).__init__(msg)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user