Skip to content

Commit d245adf

Browse files
committed
added in actions but package version stuff broken
1 parent 153da9f commit d245adf

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

chef/lib/chef/provider/package/easy_install.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,15 @@ def load_current_resource
6262
end
6363

6464
def candidate_version
65-
return @candidate_version if @candidate_version
66-
@canidate_version = @new_resource.version
67-
@candidate_version
65+
no_version = ""
66+
no_version
6867
end
6968

7069
def install_package(name, version)
71-
if version
72-
run_command(:command => "#{easy_install_binary_path} \"#{name}==#{version}\"")
73-
else
70+
if version == ""
7471
run_command(:command => "#{easy_install_binary_path} #{name}")
72+
else
73+
run_command(:command => "#{easy_install_binary_path} \"#{name}==#{version}\"")
7574
end
7675
end
7776

chef/lib/chef/resource/easy_install_package.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@
2020

2121
class Chef
2222
class Resource
23-
class EasyInstall < Chef::Resource::Package
23+
class EasyInstallPackage < Chef::Resource::Package
2424

2525
def initialize(name, collection=nil, node=nil)
2626
super(name, collection, node)
2727
@resource_name = :easy_install_package
2828
@provider = Chef::Provider::Package::EasyInstall
2929
end
3030

31-
# Sets a custom easy_install_binary to run for easy_install commands.
3231
def easy_install_binary(arg=nil)
3332
set_or_return(
3433
:easy_install_binary,

0 commit comments

Comments
 (0)