summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPat Cox <pcox@fb.com>2015-01-05 20:42:31 -0800
committerPat Cox <pcox@fb.com>2015-01-12 10:13:22 -0800
commitc793d2d5a4fe69c3e636239145139c0afb02fec1 (patch)
tree9bfc5945bda20d324d39b794a4413da2087990f9
parent55cdb2c6fa2f0e8a7da074862f95590f088719a2 (diff)
downloadchef-c793d2d5a4fe69c3e636239145139c0afb02fec1.tar.gz
Macports provider - provide package
The MacPorts provider should provide package so that you can change the precedence in provider mappings, with a statement like this: Chef::Platform::ProviderPriorityMap.instance.priority( :package, Chef::Provider::Package::Macports, :os => 'darwin' ) Also, set default priority in mapping so that homebrew wins.
-rw-r--r--lib/chef/platform/provider_priority_map.rb1
-rw-r--r--lib/chef/provider/package/macports.rb1
-rw-r--r--lib/chef/resource/macports_package.rb1
3 files changed, 3 insertions, 0 deletions
diff --git a/lib/chef/platform/provider_priority_map.rb b/lib/chef/platform/provider_priority_map.rb
index 765dd74859..aa69761012 100644
--- a/lib/chef/platform/provider_priority_map.rb
+++ b/lib/chef/platform/provider_priority_map.rb
@@ -66,6 +66,7 @@ class Chef
#
priority :service, Chef::Provider::Service::Macosx, os: "darwin"
+ priority :package, Chef::Provider::Package::Homebrew, os: "darwin"
end
def priority_map
diff --git a/lib/chef/provider/package/macports.rb b/lib/chef/provider/package/macports.rb
index 2f15d4c277..248dc75d28 100644
--- a/lib/chef/provider/package/macports.rb
+++ b/lib/chef/provider/package/macports.rb
@@ -4,6 +4,7 @@ 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)
diff --git a/lib/chef/resource/macports_package.rb b/lib/chef/resource/macports_package.rb
index 71d28b89be..0d4e5dec65 100644
--- a/lib/chef/resource/macports_package.rb
+++ b/lib/chef/resource/macports_package.rb
@@ -21,6 +21,7 @@ class Chef
class MacportsPackage < Chef::Resource::Package
provides :macports_package
+ provides :package, os: "darwin"
def initialize(name, run_context=nil)
super