From 7f34e1300aa8576fc367c08061c1e87288f9b65d Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 2 Jun 2010 19:52:31 -0700 Subject: [PATCH] [rackspace] fix model notfound handling --- lib/fog/rackspace/models/servers/flavors.rb | 2 +- lib/fog/rackspace/models/servers/images.rb | 2 +- lib/fog/rackspace/models/servers/servers.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/fog/rackspace/models/servers/flavors.rb b/lib/fog/rackspace/models/servers/flavors.rb index f5e16fba2..47ad0e331 100644 --- a/lib/fog/rackspace/models/servers/flavors.rb +++ b/lib/fog/rackspace/models/servers/flavors.rb @@ -29,7 +29,7 @@ module Fog def get(flavor_id) data = connection.get_flavor_details(flavor_id).body['flavor'] new(data) - rescue Excon::Errors::NotFound + rescue Fog::Rackspace::Servers::NotFound nil end diff --git a/lib/fog/rackspace/models/servers/images.rb b/lib/fog/rackspace/models/servers/images.rb index ff002c84e..934de7d82 100644 --- a/lib/fog/rackspace/models/servers/images.rb +++ b/lib/fog/rackspace/models/servers/images.rb @@ -38,7 +38,7 @@ module Fog def get(image_id) data = connection.get_image_details(image_id).body['image'] new(data) - rescue Excon::Errors::NotFound + rescue Fog::Rackspace::Servers::NotFound nil end diff --git a/lib/fog/rackspace/models/servers/servers.rb b/lib/fog/rackspace/models/servers/servers.rb index 2fe37f289..8b3ea11e0 100644 --- a/lib/fog/rackspace/models/servers/servers.rb +++ b/lib/fog/rackspace/models/servers/servers.rb @@ -30,7 +30,7 @@ module Fog if server = connection.get_server_details(server_id).body['server'] new(server) end - rescue Excon::Errors::NotFound + rescue Fog::Rackspace::Servers::NotFound nil end