Signed-off-by: Wenkai Yin <yinw@vmware.com>
Upstream-commit: 8f37abd056db2fdd1d1b23bdfbcbb907f1511fc3
Component: engine
This commit is contained in:
Wenkai Yin
2016-08-31 15:37:52 +08:00
parent 46917ea009
commit c689c5c3a7
+2 -5
View File
@@ -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()