diff options
| author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-07 16:31:47 -0700 |
|---|---|---|
| committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-07 16:31:47 -0700 |
| commit | 2fb41adaf4cdd3cb80bfc2f74e2111363b03bd80 (patch) | |
| tree | 8515901c90ff1167133a7e463b91ce60e83ff675 /lib | |
| parent | 5453d5596ecf7d4635329ae710a0b91346a29875 (diff) | |
| parent | 21ca7263c04e04499558504ed2c7c0313cb545a5 (diff) | |
| download | chef-2fb41adaf4cdd3cb80bfc2f74e2111363b03bd80.tar.gz | |
Merge pull request #1658 from kgraham/master
Bad handling of ShellOut:live_stream
Diffstat (limited to 'lib')
| -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 |