From 57e12037ac8f8eb48cc05979c3030853d011dfea Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Fri, 30 Sep 2016 11:46:37 -0700 Subject: [PATCH] Fix error reporting in `CopyFileWithTar` Signed-off-by: Tonis Tiigi --- pkg/archive/archive.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index 2a2166d439..d8e9f70c05 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -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 } }()