diff options
| author | Xabier de Zuazo <xabier@zuazo.org> | 2013-01-23 22:32:08 +0100 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2013-06-19 14:18:43 -0700 |
| commit | 4c29883b38c6179a8b3fead064d7095159ba5cca (patch) | |
| tree | b10193aeb0681b39c6d9237ea2eb7bffc8ebf766 /lib/chef/resource.rb | |
| parent | 62b156aec03ecb1d6ece0a3dc8a277f5332d0990 (diff) | |
| download | chef-4c29883b38c6179a8b3fead064d7095159ba5cca.tar.gz | |
[CHEF-972] removed the #self.not_if method and the private constructor from ConditionalActionNothing and renamed to ConditionalActionNotNothing
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 727a0b7962..997c614171 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/mixin/convert_to_class_name' require 'chef/resource/conditional' -require 'chef/resource/conditional_action_nothing' +require 'chef/resource/conditional_action_not_nothing' require 'chef/resource_collection' require 'chef/resource_platform_map' require 'chef/node' @@ -676,7 +676,7 @@ F # # Also skips conditional checking when the action is :nothing def should_skip?(action) - conditional_action = ConditionalActionNothing.not_if(action) + conditional_action = ConditionalActionNotNothing.new(action) conditionals = [ conditional_action ] + only_if + not_if conditionals.find do |conditional| |