Put homebrew and macports together in an explicit priority array

3 files changed, 7 insertions, 7 deletions

diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index 86c158f23d..b903ef5f42 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -490,11 +490,13 @@ class Chef
           false
         end
       end
+
+      # Set provider priority
+      require 'chef/chef_class'
+      require 'chef/provider/package/homebrew'
+      require 'chef/provider/package/macports'
+
+      Chef.set_provider_priority_array :package, [ Homebrew, Macports ], os: "darwin"
     end
   end
 end
-
-require 'chef/chef_class'
-require 'chef/provider/package/homebrew'
-
-Chef.set_provider_priority_array :package, Chef::Provider::Package::Homebrew, os: "darwin"
diff --git a/lib/chef/provider/package/homebrew.rb b/lib/chef/provider/package/homebrew.rb
index 603899646f..e2bc24d1ec 100644
--- a/lib/chef/provider/package/homebrew.rb
+++ b/lib/chef/provider/package/homebrew.rb
@@ -27,7 +27,6 @@ class Chef
       class Homebrew < Chef::Provider::Package
 
         provides :homebrew_package
-        provides :package, os: "darwin"
 
         include Chef::Mixin::HomebrewUser
 
diff --git a/lib/chef/provider/package/macports.rb b/lib/chef/provider/package/macports.rb
index b252344c99..97c13fec73 100644
--- a/lib/chef/provider/package/macports.rb
+++ b/lib/chef/provider/package/macports.rb
@@ -4,7 +4,6 @@ class Chef
       class Macports < Chef::Provider::Package
 
         provides :macports_package
-        provides :package, os: "darwin"
 
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)