Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4558 from gyuho/path_fix

Browse Source 
etcd-agent: get base when renaming
This commit is contained in:
Gyu-Ho Lee 2016-02-18 09:15:27 -08:00
commit 566fd02f62
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/functional-tester/etcd-agent/agent.go
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
}