瀏覽代碼

fixes #25654

Signed-off-by: Wenkai Yin <yinw@vmware.com>
Wenkai Yin 9 年之前
父節點
當前提交
8f37abd056
共有 1 個文件被更改,包括 2 次插入5 次删除
  1. 2 5
      image/tarexport/load.go

+ 2 - 5
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()