0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Comment CmdStream a little bit to facilitate future fixes and contributions

Browse source
This commit is contained in:
Solomon Hykes 2013-03-29 13:26:02 -07:00
parent fdae64d8d7
commit 6ede6bc8f2
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
archive.go
View file

@ -56,6 +56,7 @@ func CmdStream(cmd *exec.Cmd) (io.Reader, error) {
} }
pipeR, pipeW := io.Pipe() pipeR, pipeW := io.Pipe()
errChan := make(chan []byte) errChan := make(chan []byte)
// Collect stderr, we will use it in case of an error
go func() { go func() {
errText, e := ioutil.ReadAll(stderr) errText, e := ioutil.ReadAll(stderr)
if e != nil { if e != nil {
@ -63,6 +64,7 @@ func CmdStream(cmd *exec.Cmd) (io.Reader, error) {
} }
errChan <- errText errChan <- errText
}() }()
// Copy stdout to the returned pipe
go func() { go func() {
_, err := io.Copy(pipeW, stdout) _, err := io.Copy(pipeW, stdout)
if err != nil { if err != nil {
@ -75,6 +77,7 @@ func CmdStream(cmd *exec.Cmd) (io.Reader, error) {
pipeW.Close() pipeW.Close()
} }
}() }()
// Run the command and return the pipe
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return nil, err return nil, err
} }