From b31b2dab8760c2c1e8d7a811501c1ac30be03a44 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 29 Jul 2014 16:41:57 +0200 Subject: [PATCH] Fix some Exceptions incompatibilities Change-Id: I1f2387dc2655dee47a98cb507428a472b24c7a51 --- glance/store/backend.py | 4 +++- glance/store/exceptions.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/glance/store/backend.py b/glance/store/backend.py index 4d56d16f..a2eb83c4 100644 --- a/glance/store/backend.py +++ b/glance/store/backend.py @@ -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) diff --git a/glance/store/exceptions.py b/glance/store/exceptions.py index 03d39456..901b70f7 100644 --- a/glance/store/exceptions.py +++ b/glance/store/exceptions.py @@ -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)