Add typo in remove all. Ensure tmpDir is removed

Upstream-commit: 9de45904980dba224e8ab133f12cfc53835e2dd4
Component: engine
This commit is contained in:
Michael Crosby
2013-11-20 03:52:33 +00:00
committed by Frederick F. Kautz IV
parent 3f60be4255
commit 92e4e393e6
+3 -2
View File
@@ -208,6 +208,8 @@ func (srv *Server) ImageExport(name string, out io.Writer) error {
if err != nil {
return err
}
defer os.RemoveAll(tempdir)
utils.Debugf("Serializing %s", name)
rootRepo := srv.runtime.repositories.Repositories[name]
@@ -219,7 +221,7 @@ func (srv *Server) ImageExport(name string, out io.Writer) error {
if err := os.Mkdir(tmpImageDir, os.ModeDir); err != nil {
return err
}
defer os.RemoveAll(tempdir)
defer os.RemoveAll(tmpImageDir)
var version = "1.0"
var versionBuf = []byte(version)
@@ -277,7 +279,6 @@ func (srv *Server) ImageExport(name string, out io.Writer) error {
if err != nil {
return err
}
defer os.RemoveAll(tempdir)
if _, err := io.Copy(out, fs); err != nil {
return err