Move supports_with_pkgng? check to the freebsd_package package.

2 files changed, 11 insertions, 25 deletions

diff --git a/lib/chef/provider/package/freebsd/port.rb b/lib/chef/provider/package/freebsd/port.rb
index 536b73728f..8b191179f0 100644
--- a/lib/chef/provider/package/freebsd/port.rb
+++ b/lib/chef/provider/package/freebsd/port.rb
@@ -34,7 +34,7 @@ class Chef
           end
 
           def current_installed_version
-            pkg_info = if supports_pkgng?
+            pkg_info = if @new_resource.supports_pkgng?
                          shell_out!("pkg info \"#{@new_resource.package_name}\"", :env => nil, :returns => [0,70])
                        else
                          shell_out!("pkg_info -E \"#{@new_resource.package_name}*\"", :env => nil, :returns => [0,1])
@@ -53,19 +53,6 @@ class Chef
           def port_dir
             super(@new_resource.package_name)
           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[: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
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