diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-30 08:56:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-30 08:56:39 +0000 |
| commit | fe729b10a57ac3e534956963d13274044601b234 (patch) | |
| tree | 60deb2c68c3bcfae7c6c3cb72e934abfc3675d31 | |
| parent | 8cdfcb8416e3de18cf9abc7e75a40225c58e7f0e (diff) | |
| parent | b31b2dab8760c2c1e8d7a811501c1ac30be03a44 (diff) | |
| download | glance_store-fe729b10a57ac3e534956963d13274044601b234.tar.gz | |
Merge "Fix some Exceptions incompatibilities"
| -rw-r--r-- | glance/store/backend.py | 4 | ||||
| -rw-r--r-- | 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 4d56d16..a2eb83c 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 03d3945..901b70f 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) |