Explorar o código

etcd-agent: get base when renaming

Partially related to https://github.com/coreos/etcd/issues/4552.
Gyu-Ho Lee %!s(int64=10) %!d(string=hai) anos
pai
achega
b2bad7bd79
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      tools/functional-tester/etcd-agent/agent.go

+ 2 - 2
tools/functional-tester/etcd-agent/agent.go

@@ -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
 		}