diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-04-24 10:50:13 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-04-24 10:50:13 -0700 |
| commit | 391c9a62143e43a623cdbebbf6f460653b66e94d (patch) | |
| tree | 770843cc82605eaca983c5d4af191508ff71b041 /lib | |
| parent | 57cdbe124f63e47cab960e714572539d3979b90f (diff) | |
| download | chef-391c9a62143e43a623cdbebbf6f460653b66e94d.tar.gz | |
Revert "Fix API break in 12.3.0.rc.0"
This reverts commit 57cdbe124f63e47cab960e714572539d3979b90f.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/mixin/provides.rb | 1 | ||||
| -rw-r--r-- | lib/chef/provider_resolver.rb | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/chef/mixin/provides.rb b/lib/chef/mixin/provides.rb index bc25af62b2..e5bb2c2005 100644 --- a/lib/chef/mixin/provides.rb +++ b/lib/chef/mixin/provides.rb @@ -25,7 +25,6 @@ class Chef # provides a node on the resource (early binding) def provides?(node, resource_name) - resource_name = resource_name.resource_name if resource_name.is_a?(Chef::Resource) node_map.get(node, resource_name) end end diff --git a/lib/chef/provider_resolver.rb b/lib/chef/provider_resolver.rb index 45122d7156..867c3deca8 100644 --- a/lib/chef/provider_resolver.rb +++ b/lib/chef/provider_resolver.rb @@ -47,9 +47,7 @@ class Chef def enabled_handlers @enabled_handlers ||= providers.select do |klass| - # NB: this is different from resoruce_resolver which must pass a resource_name - # FIXME: deprecate this and normalize on passing resource_name here - klass.provides?(node, resource) + klass.provides?(node, resource.resource_name) end.sort {|a,b| a.to_s <=> b.to_s } end |