diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2014-09-25 13:18:18 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2014-09-30 20:13:17 -0400 |
| commit | 6591d4b2ea640cc838bcfd7ff667ed1e9966486f (patch) | |
| tree | a5bc2444f6c27df901ed794786c44a36454e0907 /lib/chef/resource/conditional.rb | |
| parent | d23eb2cdbdb2a9f49653426756c1d84cb2cab4be (diff) | |
| download | chef-6591d4b2ea640cc838bcfd7ff667ed1e9966486f.tar.gz | |
update functional tests for guard_interpreter
we now raise an error when passed a block and a guard_interpreter is
specified other than :default. When other interpreters become the "default"
(which actually means use the default shell for that platform) we will
need to consider those as well, i.e. #1495.
Diffstat (limited to 'lib/chef/resource/conditional.rb')
| -rw-r--r-- | lib/chef/resource/conditional.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/conditional.rb b/lib/chef/resource/conditional.rb index ad082c82d1..30abfdec81 100644 --- a/lib/chef/resource/conditional.rb +++ b/lib/chef/resource/conditional.rb @@ -54,7 +54,7 @@ class Chef raise ArgumentError, "only_if/not_if requires either a command or a block" unless block_given? if parent_resource.guard_interpreter != :default msg = "#{parent_resource.name} was given a guard_interpreter of #{parent_resource.guard_interpreter}, " - msg << "but not given a command as a string. guard_interpreter does not support blocks." + msg << "but not given a command as a string. guard_interpreter does not support blocks (because they just contain ruby)." raise ArgumentError, msg end @guard_interpreter = nil |