iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7814 from hashicorp/fix_7805 

fix bug where ReadAll on the stderr pipe was causing an infinite hang…
This commit is contained in:
Megan Marsh 2019-07-01 09:03:55 -07:00 committed by GitHub
parent 049811d329 8d5ecb9514
commit e2fe35ef40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builder/docker/communicator.go
View File

@ -246,18 +246,16 @@ func (c *Communicator) Download(src string, dst io.Writer) error {
// enables it to work with directories. We don't actually support
// directories in Download() but we still need to handle the tar format.
stderrOut, err := ioutil.ReadAll(stderrP)
if err != nil {
return err
}
if string(stderrOut) != "" {
return fmt.Errorf("Error downloading file: %s", string(stderrOut))
}
archive := tar.NewReader(pipe)
_, err = archive.Next()
if err != nil {
// see if we can get a useful error message from stderr, since stdout
// is messed up.
if stderrOut, err := ioutil.ReadAll(stderrP); err == nil {
if string(stderrOut) != "" {
return fmt.Errorf("Error downloading file: %s", string(stderrOut))
}
}
return fmt.Errorf("Failed to read header from tar stream: %s", err)
}