1
0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00

Merge pull request #27075 from tonistiigi/copy-error-reporting

Fix error reporting in `CopyFileWithTar`
Upstream-commit: 6de38ebc4dfbea0f4a805a6baee109b4c830c272
Component: engine
This commit is contained in:
Brian Goff
2016-09-30 18:14:13 -04:00
committed by GitHub

View File

@@ -1050,7 +1050,7 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {
return nil
})
defer func() {
if er := <-errC; err != nil {
if er := <-errC; err == nil && er != nil {
err = er
}
}()