summaryrefslogtreecommitdiff
path: root/lib/mixlib/shellout/unix.rb
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2014-05-13 14:47:59 -0700
committerSerdar Sutay <serdar@opscode.com>2014-05-13 14:47:59 -0700
commitfe7e7a481baed7366f18a81103bb7a95cf5e2b2b (patch)
treeec68cf1065d2981f21984ed1d59b1cafb3af2449 /lib/mixlib/shellout/unix.rb
parent59d13c943af14bb337589904e4b27a6460322a0a (diff)
parente30a3b6a9e4931201aab59f61ab27e60c7446b5c (diff)
downloadmixlib-shellout-fe7e7a481baed7366f18a81103bb7a95cf5e2b2b.tar.gz
Merge pull request #26 from akshaykarle/master
[#MIXLIB-19] Copy stderr to live_stream along with stdout of the subprocess
Diffstat (limited to 'lib/mixlib/shellout/unix.rb')
-rw-r--r--lib/mixlib/shellout/unix.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/mixlib/shellout/unix.rb b/lib/mixlib/shellout/unix.rb
index 03f619b..aac28f0 100644
--- a/lib/mixlib/shellout/unix.rb
+++ b/lib/mixlib/shellout/unix.rb
@@ -288,6 +288,7 @@ module Mixlib
def read_stderr_to_buffer
while chunk = child_stderr.read_nonblock(READ_SIZE)
@stderr << chunk
+ @live_stream << chunk if @live_stream
end
rescue Errno::EAGAIN
rescue EOFError