diff options
author | Chris Roberts <chrisroberts.code@gmail.com> | 2013-01-17 09:04:28 -0800 |
---|---|---|
committer | Bryan McLellan <btm@opscode.com> | 2013-05-24 11:18:29 -0700 |
commit | ba8abc1b2d33dd20963d8e626acc4f2b19781c1b (patch) | |
tree | ccdb02970fcf1dd7d85ce0a81d09e41480c85934 | |
parent | d639053a616d2e82d31c82a201da28461d54d680 (diff) | |
download | chef-ba8abc1b2d33dd20963d8e626acc4f2b19781c1b.tar.gz |
Remove block parameter support from #set_or_return
-rw-r--r-- | chef/lib/chef/mixin/params_validate.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chef/lib/chef/mixin/params_validate.rb b/chef/lib/chef/mixin/params_validate.rb index fe0eef372c..2f00ca0de8 100644 --- a/chef/lib/chef/mixin/params_validate.rb +++ b/chef/lib/chef/mixin/params_validate.rb @@ -81,12 +81,12 @@ class Chef DelayedEvaluator.new(&block) end - def set_or_return(symbol, arg, validation, &block) + def set_or_return(symbol, arg, validation) iv_symbol = "@#{symbol.to_s}".to_sym map = { symbol => validation } - if arg == nil && self.instance_variable_defined?(iv_symbol) == true && !block_given? + if arg == nil && self.instance_variable_defined?(iv_symbol) == true ivar = self.instance_variable_get(iv_symbol) if(ivar.is_a?(DelayedEvaluator)) validate({ symbol => ivar.call }, { symbol => validation })[symbol] @@ -96,8 +96,6 @@ class Chef else if(arg.is_a?(DelayedEvaluator)) val = arg - elsif(block_given?) - val = DelayedEvaluator.new(&block) else val = validate({ symbol => arg }, { symbol => validation })[symbol] end |