Move supports_with_pkgng? check to the freebsd_package package.

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