From 8f37abd056db2fdd1d1b23bdfbcbb907f1511fc3 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 31 Aug 2016 15:37:52 +0800 Subject: [PATCH] fixes #25654 Signed-off-by: Wenkai Yin --- image/tarexport/load.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/image/tarexport/load.go b/image/tarexport/load.go index 46d2490baf..01f9a6de86 100644 --- a/image/tarexport/load.go +++ b/image/tarexport/load.go @@ -52,7 +52,7 @@ func (l *tarexporter) Load(inTar io.ReadCloser, outStream io.Writer, quiet bool) if os.IsNotExist(err) { return l.legacyLoad(tmpDir, outStream, progressOutput) } - return manifestFile.Close() + return err } defer manifestFile.Close() @@ -230,10 +230,7 @@ func (l *tarexporter) legacyLoad(tmpDir string, outStream io.Writer, progressOut } repositoriesFile, err := os.Open(repositoriesPath) if err != nil { - if !os.IsNotExist(err) { - return err - } - return repositoriesFile.Close() + return err } defer repositoriesFile.Close()