Exempt /server-status from redirection

[chef.git] / cookbooks / python / resources / package.rb

diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb
index d6431c87da8714116d29f5e0101b6ac5469a096b..7dddd17afdb2caefef201557788acfc4c4089939 100644 (file)
--- a/cookbooks/python/resources/package.rb
+++ b/cookbooks/python/resources/package.rb
@@ -24,13 +24,13 @@ property :version, :kind_of => String
 property :python_version, :kind_of => String
 
 action :install do
 property :python_version, :kind_of => String
 
 action :install do

-  if version.nil?
-    execute "pip-install-#{name}" do
+  if new_resource.version.nil?
+    execute "pip-install-#{new_resource.package_name}" do

       command "#{pip_command} install #{new_resource.package_name}"
       not_if "#{pip_command} show #{new_resource.package_name}"
     end
   else
       command "#{pip_command} install #{new_resource.package_name}"
       not_if "#{pip_command} show #{new_resource.package_name}"
     end
   else

-    execute "pip-install-#{name}" do
+    execute "pip-install-#{new_resource.package_name}" do

       command "#{pip_command} install #{new_resource.package_name}==#{new_resource.version}"
       not_if "#{pip_command} show #{new_resource.package_name} | fgrep -q #{new_resource.version}"
     end
       command "#{pip_command} install #{new_resource.package_name}==#{new_resource.version}"
       not_if "#{pip_command} show #{new_resource.package_name} | fgrep -q #{new_resource.version}"
     end


@@ -38,12 +38,14 @@ action :install do
 end
 
 action :remove do
 end
 
 action :remove do

-  execute "pip-uninstall-#{name}" do
+  execute "pip-uninstall-#{new_resource.package_name}" do

     command "#{pip_command} uninstall #{new_resource.package_name}"
     only_if "#{pip_command} show #{new_resource.package_name}"
   end
 end
 
     command "#{pip_command} uninstall #{new_resource.package_name}"
     only_if "#{pip_command} show #{new_resource.package_name}"
   end
 end
 

-def pip_command
-  "pip#{python_version}"
+action_class do
+  def pip_command
+    "pip#{new_resource.python_version}"
+  end

 end
 end