mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #4558 from gyuho/path_fix
etcd-agent: get base when renaming
This commit is contained in:
commit
566fd02f62
@ -212,12 +212,12 @@ func archiveLogAndDataDir(log string, datadir string) error {
|
|||||||
if err := os.MkdirAll(dir, 0755); err != nil {
|
if err := os.MkdirAll(dir, 0755); err != nil {
|
||||||
return err
|
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) {
|
if !os.IsNotExist(err) {
|
||||||
return 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) {
|
if !os.IsNotExist(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user