diff options
author | John Keiser <john@johnkeiser.com> | 2015-06-30 21:14:28 -0600 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2015-07-06 12:04:47 -0600 |
commit | 591b5599f5412faa382e45d035d76535cd93736a (patch) | |
tree | 3494785822024b7c4acc97adc4883c7a73e2eaaf /lib/chef/resource.rb | |
parent | cfd2b1fa1b26e8b0aa92a5ba8bd294b96379b2fa (diff) | |
download | chef-591b5599f5412faa382e45d035d76535cd93736a.tar.gz |
Re-separate priority map and DSL handler map so that provides has veto power over priority
Diffstat (limited to 'lib/chef/resource.rb')
-rw-r--r-- | lib/chef/resource.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index 5e9ba42703..ac6f5e8923 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -1550,7 +1550,7 @@ class Chef remove_canonical_dsl end - result = Chef.resource_priority_map.set(name, self, options, &block) + result = Chef.resource_handler_map.set(name, self, options, &block) Chef::DSL::Resources.add_resource_dsl(name) result end @@ -1742,7 +1742,7 @@ class Chef def self.remove_canonical_dsl if @resource_name - remaining = Chef.resource_priority_map.delete_canonical(@resource_name, self) + remaining = Chef.resource_handler_map.delete_canonical(@resource_name, self) if !remaining Chef::DSL::Resources.remove_resource_dsl(@resource_name) end |