diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2010-12-22 13:20:32 -0600 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2010-12-22 13:20:32 -0600 |
| commit | ea4ee5736063b95d19dff24b3692e4239639dda2 (patch) | |
| tree | 5443e7523c738f0dd0fd04b7914ea38d3c35af89 /nova/image | |
| parent | af4d6e84c67b8f59f63ef0275778fa897dac9e95 (diff) | |
| parent | 9547b76a69ad8f6a7c646dd2b5ac37b965f7013c (diff) | |
| download | nova-ea4ee5736063b95d19dff24b3692e4239639dda2.tar.gz nova-ea4ee5736063b95d19dff24b3692e4239639dda2.tar.xz nova-ea4ee5736063b95d19dff24b3692e4239639dda2.zip | |
Merging trunk
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/glance.py | 8 | ||||
| -rw-r--r-- | nova/image/s3.py | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 84e4eaa7d..f002a1e3d 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -78,8 +78,8 @@ class ParallaxClient(object): data = json.loads(res.read())['images'] return data else: - logging.warn("Parallax returned HTTP error %d from " - "request for /images", res.status_int) + logging.warn(_("Parallax returned HTTP error %d from " + "request for /images"), res.status_int) return [] finally: c.close() @@ -97,8 +97,8 @@ class ParallaxClient(object): data = json.loads(res.read())['images'] return data else: - logging.warn("Parallax returned HTTP error %d from " - "request for /images/detail", res.status_int) + logging.warn(_("Parallax returned HTTP error %d from " + "request for /images/detail"), res.status_int) return [] finally: c.close() diff --git a/nova/image/s3.py b/nova/image/s3.py index 0a25161de..7b04aa072 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -79,7 +79,8 @@ class S3ImageService(service.BaseImageService): result = self.index(context) result = [i for i in result if i['imageId'] == image_id] if not result: - raise exception.NotFound('Image %s could not be found' % image_id) + raise exception.NotFound(_('Image %s could not be found') + % image_id) image = result[0] return image |