diff options
| author | John Keiser <john@johnkeiser.com> | 2015-06-16 16:27:52 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2015-06-18 15:07:48 -0700 |
| commit | db59fd9392a97328df8d7ba7f1c2b1fc03058e76 (patch) | |
| tree | a5ec9072139c642ffb39d80866512ad0150dfaf5 /lib/chef/resource | |
| parent | 59717769a12768c62aa18270a51b91c820b67010 (diff) | |
| download | chef-db59fd9392a97328df8d7ba7f1c2b1fc03058e76.tar.gz | |
Sort identical "provides" alphabetically (for backcompat)
- Warn when multiple providers try to provide the same thing
Diffstat (limited to 'lib/chef/resource')
| -rw-r--r-- | lib/chef/resource/macports_package.rb | 3 | ||||
| -rw-r--r-- | lib/chef/resource/package.rb | 5 |
2 files changed, 2 insertions, 6 deletions
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" |