Merge pull request #4516 from gyuho/path

etcd-agent: ignore error when no file to rename
This commit is contained in:
Gyu-Ho Lee 2016-02-13 14:24:17 -08:00
commit 20ac633059

View File

@ -194,7 +194,14 @@ func archiveLogAndDataDir(log string, datadir string) error {
return err
}
if err := os.Rename(log, path.Join(dir, log)); err != nil {
return err
if !os.IsNotExist(err) {
return err
}
}
return os.Rename(datadir, path.Join(dir, datadir))
if err := os.Rename(datadir, path.Join(dir, datadir)); err != nil {
if !os.IsNotExist(err) {
return err
}
}
return nil
}