summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Kantrowitz <noah@coderanger.net>2015-06-29 16:40:15 -0700
committerNoah Kantrowitz <noah@coderanger.net>2015-06-29 16:40:15 -0700
commit13963d00bbb47606330efdef2899293aaaa0a70e (patch)
treee2a243ea2d74fd5c870587c06e31adc85ca1102b
parent91b1de7ef374022764eb30e61a92741af572ab37 (diff)
downloadchef-13963d00bbb47606330efdef2899293aaaa0a70e.tar.gz
Make resource-based guard interpreters cope with arrays.
Ping @adamedx for confirmation.
-rw-r--r--lib/chef/guard_interpreter/resource_guard_interpreter.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/guard_interpreter/resource_guard_interpreter.rb b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
index d4b386a15a..6372b206a7 100644
--- a/lib/chef/guard_interpreter/resource_guard_interpreter.rb
+++ b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
@@ -68,7 +68,8 @@ class Chef
run_action = action || @resource.action
begin
- @resource.run_action(run_action)
+ # Coerce to an array to be safe.
+ Array(run_action).each {|action_to_run| @resource.run_action(action_to_run) }
resource_updated = @resource.updated
rescue Mixlib::ShellOut::ShellCommandFailed
resource_updated = nil