diff options
author | Cory Stephenson <aevin@me.com> | 2014-08-28 18:54:29 -0500 |
---|---|---|
committer | Cory Stephenson <aevin@me.com> | 2014-08-28 18:54:29 -0500 |
commit | 712d4a87678537613413ed730888d63f3b03acd9 (patch) | |
tree | 5017678f218f4cf0fb7556dfae34270fbe2e1b34 /lib/chef/resource | |
parent | 8fa5f78102f304250ba907bf7317edcce23f53f2 (diff) | |
download | chef-712d4a87678537613413ed730888d63f3b03acd9.tar.gz |
Move supports_with_pkgng? check to the freebsd_package package.
Diffstat (limited to 'lib/chef/resource')
-rw-r--r-- | lib/chef/resource/freebsd_package.rb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lib/chef/resource/freebsd_package.rb b/lib/chef/resource/freebsd_package.rb index 0af28892dd..40cc63fc55 100644 --- a/lib/chef/resource/freebsd_package.rb +++ b/lib/chef/resource/freebsd_package.rb @@ -52,8 +52,18 @@ class Chef "#{created_as_type}[#{name}]" end + def supports_pkgng? + ships_with_pkgng? || !!shell_out!("make -V WITH_PKGNG", :env => nil).stdout.match(/yes/i) + end + private + def ships_with_pkgng? + # It was not until __FreeBSD_version 1000017 that pkgng became + # the default binary package manager. See '/usr/ports/Mk/bsd.port.mk'. + node.automatic[:os_version].to_i >= 1000017 + end + def assign_provider @provider = if @source.to_s =~ /^ports$/i Chef::Provider::Package::Freebsd::Port @@ -63,17 +73,6 @@ class Chef Chef::Provider::Package::Freebsd::Pkg end end - - def ships_with_pkgng? - # It was not until __FreeBSD_version 1000017 that pkgng became - # the default binary package manager. See '/usr/ports/Mk/bsd.port.mk'. - node[:os_version].to_i >= 1000017 - end - - def supports_pkgng? - ships_with_pkgng? || !!shell_out!("make -V WITH_PKGNG", :env => nil).stdout.match(/yes/i) - end - end end end |