diff options
| author | danielsdeleo <dan@opscode.com> | 2013-04-23 14:27:02 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2013-04-23 14:27:02 -0700 |
| commit | 5f3942e73de403006b8448b992a7f6c8aab2d15a (patch) | |
| tree | dea752e38552dc0880af88881762322e380ad4f0 /lib/chef/resource | |
| parent | a81d760fffcc798ffbfab733ffaa6ec51990e463 (diff) | |
| download | chef-5f3942e73de403006b8448b992a7f6c8aab2d15a.tar.gz | |
[CHEF-4117] fix resource attempting to remove constants it doesn't have
Module.const_defined?() needs to be given an optional second argument to
disable constant lookups on ancestor classes. Otherwise LWRP creation
may attempt to remove a constant that does not exist.
Diffstat (limited to 'lib/chef/resource')
| -rw-r--r-- | lib/chef/resource/lwrp_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index 370ccd8c10..5776bb59fb 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -39,7 +39,7 @@ class Chef # Add log entry if we override an existing light-weight resource. class_name = convert_to_class_name(rname) - if Resource.const_defined?(class_name) + if Resource.const_defined?(class_name, false) old_class = Resource.send(:remove_const, class_name) # CHEF-3432 -- Chef::Resource keeps a list of subclasses; need to # remove old ones from the list when replacing. |