summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-05-06 15:11:10 -0700
committerJohn Keiser <john@johnkeiser.com>2015-05-07 17:42:01 -0700
commit120a00d4672bf7d618926819f7ad1fc9c1797b71 (patch)
treef174865dec52b9caaadc8fd0706a5db2162b5328
parent17c48fec4eb3e8d2838f93a560b499a9e7910d6c (diff)
downloadchef-120a00d4672bf7d618926819f7ad1fc9c1797b71.tar.gz
Put homebrew and macports together in an explicit priority array
-rw-r--r--lib/chef/provider/package.rb12
-rw-r--r--lib/chef/provider/package/homebrew.rb1
-rw-r--r--lib/chef/provider/package/macports.rb1
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index 21294e22a3..37306a3f0a 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -484,11 +484,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)