diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-14 10:34:33 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-14 10:34:33 -0700 |
| commit | 6705acbd7f301d1b04388043a3dfa0308655f120 (patch) | |
| tree | 1e8a43b35ef1684a4b90578f1a6374758aa7e3c7 /lib/chef/resource/template.rb | |
| parent | 365064280c93d519fdacbf032c0c21057e5549c9 (diff) | |
| download | chef-6705acbd7f301d1b04388043a3dfa0308655f120.tar.gz | |
chefstyle Style/AndOr fixes
this is part of our informal style guide, lets make it formal since
clearly its not getting followed very well.
Diffstat (limited to 'lib/chef/resource/template.rb')
| -rw-r--r-- | lib/chef/resource/template.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb index e33af3174b..896aa71340 100644 --- a/lib/chef/resource/template.rb +++ b/lib/chef/resource/template.rb @@ -161,7 +161,7 @@ class Chef # helpers(MyTemplateHelper) # The template code in the above example will work unmodified. def helpers(module_name = nil, &block) - if block_given? and !module_name.nil? + if block_given? && !module_name.nil? raise Exceptions::ValidationFailed, "Passing both a module and block to #helpers is not supported. Call #helpers multiple times instead" elsif block_given? |