docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2505 from kunalkushwaha/bugfix#2504 

Bugfix#2504 Rename of temp file fails.
This commit is contained in:
Jean-Laurent de Morlhon 2015-12-07 09:40:42 +01:00
parent 1de66c75e4 66db37814d
commit ff54bf1b0c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libmachine/persist/filestore.go
View File

@ -41,18 +41,19 @@ func (s Filestore) saveToFile(data []byte, file string) error {
}
defer os.Remove(tmpfi.Name())
err = ioutil.WriteFile(tmpfi.Name(), data, 0600)
if err != nil {
if err = ioutil.WriteFile(tmpfi.Name(), data, 0600); err != nil {
return err
}
err = os.Remove(file)
if err != nil {
if err = tmpfi.Close(); err != nil {
return err
}
err = os.Rename(tmpfi.Name(), file)
if err != nil {
if err = os.Remove(file); err != nil {
return err
}
if err = os.Rename(tmpfi.Name(), file); err != nil {
return err
}
return nil