diff options
| author | Kevin Graham <kgraham@industrial-marshmallow.com> | 2014-07-16 17:27:43 -0700 |
|---|---|---|
| committer | Kevin Graham <kgraham@industrial-marshmallow.com> | 2014-07-16 17:27:43 -0700 |
| commit | 21ca7263c04e04499558504ed2c7c0313cb545a5 (patch) | |
| tree | 8582996e747744ca09d0fc4f8a89c1584401bbd3 /lib/chef/mixin/shell_out.rb | |
| parent | 83b159e0dc46fd5ed241a43536ef4e7cebbbdcd4 (diff) | |
| download | chef-21ca7263c04e04499558504ed2c7c0313cb545a5.tar.gz | |
Chef:Provider:Execute's logic on whether or not to use live_stream gets blindly
stomped on here. Honoring live_stream if a caller has set it.
Obvious fix.
Diffstat (limited to 'lib/chef/mixin/shell_out.rb')
| -rw-r--r-- | lib/chef/mixin/shell_out.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb index 97aa7041fd..3f80290f90 100644 --- a/lib/chef/mixin/shell_out.rb +++ b/lib/chef/mixin/shell_out.rb @@ -33,7 +33,7 @@ class Chef def shell_out(*command_args) cmd = Mixlib::ShellOut.new(*run_command_compatible_options(command_args)) - cmd.live_stream = io_for_live_stream + cmd.live_stream ||= io_for_live_stream cmd.run_command cmd end |