diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-12 15:33:27 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-12 15:33:27 -0800 |
| commit | a030711a57e126f58b2e897c915d430e67cb7d13 (patch) | |
| tree | 4c92a61db73e69587747baefc2a63683e275dd29 /lib/chef/cookbook | |
| parent | a5afeecc19170cac9d430f7bee128d05e9bca5a9 (diff) | |
| parent | f890cc4480c601b08c657cee2d24dd3ed472c054 (diff) | |
| download | chef-a030711a57e126f58b2e897c915d430e67cb7d13.tar.gz | |
Merge pull request #4573 from chef/lcg/bump-rubocop
pull rubocop 0.37.2 into chefstyle
Diffstat (limited to 'lib/chef/cookbook')
| -rw-r--r-- | lib/chef/cookbook/metadata.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb index 62e17d4f3b..7d14cea44f 100644 --- a/lib/chef/cookbook/metadata.rb +++ b/lib/chef/cookbook/metadata.rb @@ -828,7 +828,7 @@ INVALID def validate_calculated_default_rule(options) calculated_conflict = ((options[:default].is_a?(Array) && !options[:default].empty?) || (options[:default].is_a?(String) && !options[:default] != "")) && - options[:calculated] == true + options[:calculated] == true raise ArgumentError, "Default cannot be specified if calculated is true!" if calculated_conflict end |