summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2014-09-25 13:18:18 -0400
committerBryan McLellan <btm@loftninjas.org>2014-09-25 13:18:18 -0400
commit6380c08c6b749e22e7ad64d3b9eddb242bc419ec (patch)
tree74d530df2f2e20e770d74b4ef5d2c812e595796f /lib
parent36ef8cb1ed42357af1358821adace1b58773c099 (diff)
downloadchef-btm/guard-exception.tar.gz
update functional tests for guard_interpreterbtm/guard-exception
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')
-rw-r--r--lib/chef/resource/conditional.rb2
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