svn commit: r962344 - /incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb

[lu...@apache.org]

Author: lutter
Date: Thu Jul  8 23:48:07 2010
New Revision: 962344

URL: http://svn.apache.org/viewvc?rev=962344&view=rev
Log:
Removed comments from safe blocks

Modified:
    incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb?rev=962344&r1=962343&r2=962344&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb Thu Jul  8 23:48:07 2010
@@ -120,11 +120,11 @@ class EC2Driver < Deltacloud::BaseDriver
       config = { :owner_id => "amazon" }
       config.merge!({ :owner_id => opts[:owner_id] }) if opts and opts[:owner_id]
     end
-    #safely do
+    safely do
       ec2.describe_images(config).imagesSet.item.each do |image|
         img_arr << convert_image(image)
       end
-    #end
+    end
     img_arr = filter_on( img_arr, :architecture, opts )
     img_arr.sort_by{|e| [e.owner_id, e.name]}
   end
@@ -150,7 +150,7 @@ class EC2Driver < Deltacloud::BaseDriver
   def instances(credentials, opts=nil)
     ec2 = new_client(credentials)
     instances = []
-    #safely do
+    safely do
       param = opts.nil? ? nil : opts[:id]
       ec2_instances = ec2.describe_instances.reservationSet
       return [] unless ec2_instances
@@ -159,7 +159,7 @@ class EC2Driver < Deltacloud::BaseDriver
           instances << convert_instance( ec2_instance, item.ownerId )
         end
       end
-    #end
+    end
     instances = filter_on( instances, :id, opts )
     instances = filter_on( instances, :state, opts )
     instances