From 16f11aef3ce80e576f24371ffb7531d54eb96348 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 (cherry picked from commit 57e12037ac8f8eb48cc05979c3030853d011dfea) Signed-off-by: Victor Vieux --- 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 ad3d65b2fc..98b5e2fbb4 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -1040,7 +1040,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 } }()