From db59fd9392a97328df8d7ba7f1c2b1fc03058e76 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Tue, 16 Jun 2015 16:27:52 -0700 Subject: Sort identical "provides" alphabetically (for backcompat) - Warn when multiple providers try to provide the same thing --- lib/chef/resource/macports_package.rb | 3 ++- lib/chef/resource/package.rb | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/chef/resource') diff --git a/lib/chef/resource/macports_package.rb b/lib/chef/resource/macports_package.rb index 937839b6e1..5843016897 100644 --- a/lib/chef/resource/macports_package.rb +++ b/lib/chef/resource/macports_package.rb @@ -16,10 +16,11 @@ # limitations under the License. # +require 'chef/resource/package' + class Chef class Resource class MacportsPackage < Chef::Resource::Package - provides :package, os: "darwin" end end end diff --git a/lib/chef/resource/package.rb b/lib/chef/resource/package.rb index 1c6da75678..5be1c34b89 100644 --- a/lib/chef/resource/package.rb +++ b/lib/chef/resource/package.rb @@ -100,8 +100,3 @@ class Chef end end end - -require 'chef/chef_class' -require 'chef/resource/homebrew_package' - -Chef.set_resource_priority_array :package, Chef::Resource::HomebrewPackage, os: "darwin" -- cgit v1.2.1