summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-10-10 17:22:25 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-10-10 17:22:25 -0700
commit0d261ba93a6fd303b4ac99df86ab5d370a4832e5 (patch)
tree34e540c9cad5e232268179ca860076036d7b10fa
parentcdb5aab98351bc8674cba761d760c28179faa907 (diff)
downloadchef-lcg/edit_resource_scope.tar.gz
remove block_given?lcg/edit_resource_scope
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/dsl/declare_resource.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb
index dca0558bf1..ed3083e1ca 100644
--- a/lib/chef/dsl/declare_resource.rb
+++ b/lib/chef/dsl/declare_resource.rb
@@ -119,7 +119,7 @@ class Chef
#
def edit_resource!(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
resource = find_resource!(type, name, run_context: run_context)
- if block_given?
+ if resource_attrs_block
if defined?(new_resource)
resource.instance_exec(new_resource, &resource_attrs_block)
else
@@ -206,7 +206,7 @@ class Chef
def find_resource(type, name, created_at: nil, run_context: self.run_context, &resource_attrs_block)
find_resource!(type, name, run_context: run_context)
rescue Chef::Exceptions::ResourceNotFound
- if block_given?
+ if resource_attrs_block
declare_resource(type, name, created_at, run_context: run_context, &resource_attrs_block)
end # returns nil otherwise
end