diff options
| author | Phil Dibowitz <phil@ipom.com> | 2015-01-09 17:38:08 -0800 |
|---|---|---|
| committer | Phil Dibowitz <phil@ipom.com> | 2015-01-09 17:38:08 -0800 |
| commit | 9b2ba0d1e38967cd8d3827f2ba69afc8b8713b48 (patch) | |
| tree | 372374d80196fc52eb5d1373918dda0cbdb7ba47 | |
| parent | d1272bb37db8ecbb38da57ed5f4b6d3985e58980 (diff) | |
| parent | 6e92b1b4e5d774bdd4e93b2d782565a45ba4182e (diff) | |
| download | chef-9b2ba0d1e38967cd8d3827f2ba69afc8b8713b48.tar.gz | |
Merge pull request #2721 from patcox/CHEF-2691
correct filters for MacPorts package provider
| -rw-r--r-- | lib/chef/provider/package/macports.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/macports_package.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider_resolver_spec.rb | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/provider/package/macports.rb b/lib/chef/provider/package/macports.rb index cd142eca42..2f15d4c277 100644 --- a/lib/chef/provider/package/macports.rb +++ b/lib/chef/provider/package/macports.rb @@ -3,7 +3,7 @@ class Chef class Package class Macports < Chef::Provider::Package - provides :macports_package, os: "mac_os_x" + provides :macports_package def load_current_resource @current_resource = Chef::Resource::Package.new(@new_resource.name) diff --git a/lib/chef/resource/macports_package.rb b/lib/chef/resource/macports_package.rb index bdc8698155..71d28b89be 100644 --- a/lib/chef/resource/macports_package.rb +++ b/lib/chef/resource/macports_package.rb @@ -20,7 +20,7 @@ class Chef class Resource class MacportsPackage < Chef::Resource::Package - provides :macports_package, os: "mac_os_x" + provides :macports_package def initialize(name, run_context=nil) super diff --git a/spec/unit/provider_resolver_spec.rb b/spec/unit/provider_resolver_spec.rb index ab19ff4bee..a9fa08ebfd 100644 --- a/spec/unit/provider_resolver_spec.rb +++ b/spec/unit/provider_resolver_spec.rb @@ -511,10 +511,11 @@ describe Chef::ProviderResolver do supported_providers = [ :apt_package, :bash, :breakpoint, :chef_gem, :cookbook_file, :csh, :deploy, - :deploy_revision, :directory, :dpkg_package, :easy_install_package, - :erl_call, :execute, :file, :gem_package, :git, :http_request, :link, :log, :pacman_package, :paludis_package, - :perl, :python, :remote_directory, :route, :rpm_package, :ruby, :ruby_block, :script, - :subversion, :template, :timestamped_deploy, :whyrun_safe_ruby_block, :yum_package, :homebrew_package, + :deploy_revision, :directory, :dpkg_package, :easy_install_package, :erl_call, + :execute, :file, :gem_package, :git, :homebrew_package, :http_request, :link, + :log, :macports_package, :pacman_package, :paludis_package, :perl, :python, + :remote_directory, :route, :rpm_package, :ruby, :ruby_block, :script, :subversion, + :template, :timestamped_deploy, :whyrun_safe_ruby_block, :yum_package, ] supported_providers.each do |static_resource| @@ -530,9 +531,8 @@ describe Chef::ProviderResolver do end unsupported_providers = [ - :bff_package, :dsc_script, :ips_package, :macports_package, - :smartos_package, :solaris_package, :windows_package, - :windows_service, + :bff_package, :dsc_script, :ips_package, :smartos_package, + :solaris_package, :windows_package, :windows_service, ] unsupported_providers.each do |static_resource| |