diff options
| author | Tim Smith <tsmith@chef.io> | 2020-05-04 10:12:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 10:12:29 -0700 |
| commit | bedccf12d841820fa08e970edc75ce7e151b05d7 (patch) | |
| tree | 2c948d4614350ec8648bd7e5f5ffce6b2b123220 | |
| parent | 046df642249f89a79a2c736cfcf5246c3a76a90a (diff) | |
| parent | 139d8b9885f9595fa1989bd5d4dc627ecd56e073 (diff) | |
| download | chef-bedccf12d841820fa08e970edc75ce7e151b05d7.tar.gz | |
Merge pull request #9783 from chef/fix_mac_package
Avoid setting package to macports and then overriding to homebrew
| -rw-r--r-- | lib/chef/provider/package/homebrew.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/macports.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/chef/provider/package/homebrew.rb b/lib/chef/provider/package/homebrew.rb index 012bcdbb13..d61a0314c0 100644 --- a/lib/chef/provider/package/homebrew.rb +++ b/lib/chef/provider/package/homebrew.rb @@ -27,7 +27,7 @@ class Chef allow_nils use_multipackage_api - provides :package, os: "darwin", override: true + provides :package, os: "darwin" provides :homebrew_package include Chef::Mixin::HomebrewUser diff --git a/lib/chef/provider/package/macports.rb b/lib/chef/provider/package/macports.rb index 1d0bfa9984..a653dbd418 100644 --- a/lib/chef/provider/package/macports.rb +++ b/lib/chef/provider/package/macports.rb @@ -2,8 +2,6 @@ class Chef class Provider class Package class Macports < Chef::Provider::Package - - provides :package, os: "darwin" provides :macports_package def load_current_resource |