diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-08-27 14:28:53 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-08-27 17:10:44 -0700 |
| commit | 395534b88d54e6ec57eadfaab81c736c688e7938 (patch) | |
| tree | 57d8ce8aab0c25ee79593c64cf8df9a20bd53f50 /lib | |
| parent | a2c8256a6d699f254b24de61e2a7e1a20bbb2c3d (diff) | |
| download | chef-395534b88d54e6ec57eadfaab81c736c688e7938.tar.gz | |
Remove deprecated @node ivarsjk/remove_deprecated_ivars
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/recipe.rb | 1 | ||||
| -rw-r--r-- | lib/chef/resource.rb | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/chef/recipe.rb b/lib/chef/recipe.rb index 5b95d80590..32578da5ab 100644 --- a/lib/chef/recipe.rb +++ b/lib/chef/recipe.rb @@ -69,7 +69,6 @@ class Chef @run_context = run_context # TODO: 5/19/2010 cw/tim: determine whether this can be removed @params = Hash.new - @node = deprecated_ivar(run_context.node, :node, :warn) end # Used in DSL mixins diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index 84d6a2fca6..70abfbcdb0 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -23,7 +23,7 @@ require 'chef/dsl/data_query' require 'chef/dsl/registry_helper' require 'chef/dsl/reboot_pending' require 'chef/mixin/convert_to_class_name' -require 'chef//guard_interpreter/resource_guard_interpreter' +require 'chef/guard_interpreter/resource_guard_interpreter' require 'chef/resource/conditional' require 'chef/resource/conditional_action_not_nothing' require 'chef/resource_collection' @@ -121,8 +121,8 @@ F end - FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if, :@enclosing_provider] - HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node, :@not_if, :@only_if, :@elapsed_time, :@enclosing_provider] + FORBIDDEN_IVARS = [:@run_context, :@not_if, :@only_if, :@enclosing_provider] + HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@not_if, :@only_if, :@elapsed_time, :@enclosing_provider] include Chef::DSL::DataQuery include Chef::Mixin::ParamsValidate @@ -253,8 +253,6 @@ F @guard_interpreter = :default @elapsed_time = 0 @sensitive = false - - @node = run_context ? deprecated_ivar(run_context.node, :node, :warn) : nil end # Returns a Hash of attribute => value for the state attributes declared in |