etcd-agent: get base when renaming

Partially related to https://github.com/coreos/etcd/issues/4552.
release-2.3
Gyu-Ho Lee 2016-02-18 09:03:34 -08:00
parent 4a041693de
commit b2bad7bd79
1 changed files with 2 additions and 2 deletions

View File

@ -212,12 +212,12 @@ func archiveLogAndDataDir(log string, datadir string) error {
if err := os.MkdirAll(dir, 0755); err != nil {
return err
}
if err := os.Rename(log, path.Join(dir, log)); err != nil {
if err := os.Rename(log, path.Join(dir, path.Base(log))); err != nil {
if !os.IsNotExist(err) {
return err
}
}
if err := os.Rename(datadir, path.Join(dir, datadir)); err != nil {
if err := os.Rename(datadir, path.Join(dir, path.Base(datadir))); err != nil {
if !os.IsNotExist(err) {
return err
}