diff options
| author | Cory Stephenson <aevin@me.com> | 2014-08-24 02:20:53 -0500 |
|---|---|---|
| committer | Cory Stephenson <aevin@me.com> | 2014-08-24 02:20:53 -0500 |
| commit | e8baa285975dac507da3337e9c598e1aa44a78c2 (patch) | |
| tree | c2088c1785c720ed3e90c1d11a5091726d02f744 /lib/chef/resource/freebsd_package.rb | |
| parent | 920d190cd817da50dcf87c3046b7c5f3bdcae7f9 (diff) | |
| download | chef-e8baa285975dac507da3337e9c598e1aa44a78c2.tar.gz | |
Have freebsd port use pkg info if the freebsd version is >= 10000017
Diffstat (limited to 'lib/chef/resource/freebsd_package.rb')
| -rw-r--r-- | lib/chef/resource/freebsd_package.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource/freebsd_package.rb b/lib/chef/resource/freebsd_package.rb index 70ef62ae8a..0af28892dd 100644 --- a/lib/chef/resource/freebsd_package.rb +++ b/lib/chef/resource/freebsd_package.rb @@ -57,7 +57,7 @@ class Chef def assign_provider @provider = if @source.to_s =~ /^ports$/i Chef::Provider::Package::Freebsd::Port - elsif ships_with_pkgng? || supports_pkgng? + elsif supports_pkgng? Chef::Provider::Package::Freebsd::Pkgng else Chef::Provider::Package::Freebsd::Pkg @@ -71,7 +71,7 @@ class Chef end def supports_pkgng? - !!shell_out!("make -V WITH_PKGNG", :env => nil).stdout.match(/yes/i) + ships_with_pkgng? || !!shell_out!("make -V WITH_PKGNG", :env => nil).stdout.match(/yes/i) end end |