diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-05-13 16:45:42 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-05-13 16:45:42 +0000 |
| commit | be83d7317ee55ae0ef436f09f25beef2eccee5a6 (patch) | |
| tree | 87d4f53c8bd7c5c4056b131b3fc039ee0740f1d6 /bin | |
| parent | 7dc76508d38370f3cf68029fae2ffb7749a580b2 (diff) | |
| parent | 0805521c79f934ba54f839be64a2c43ed177612d (diff) | |
| download | nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.tar.gz nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.tar.xz nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.zip | |
Merged trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 2f6af6e2d..a36ec86d0 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -972,7 +972,7 @@ class ImageCommands(object): try: internal_id = ec2utils.ec2_id_to_id(old_image_id) image = self.image_service.show(context, internal_id) - except exception.NotFound: + except (exception.InvalidEc2Id, exception.ImageNotFound): image = self.image_service.show_by_name(context, old_image_id) return image['id'] |