diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-13 06:51:18 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-13 06:51:18 -0700 |
| commit | 19386db034b6144544aaed72aeab7e562f0087bc (patch) | |
| tree | fa2b2d69f80034fe003b472054ad4d9bad499d1c /bin | |
| parent | 31b9cb7b78df8d2d6c0d68f08031b5c3abc8a62e (diff) | |
| parent | 0576766cdf3480ad02159671d2dfc0bdcb154934 (diff) | |
| download | nova-19386db034b6144544aaed72aeab7e562f0087bc.tar.gz nova-19386db034b6144544aaed72aeab7e562f0087bc.tar.xz nova-19386db034b6144544aaed72aeab7e562f0087bc.zip | |
trunk merge
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'] |