From b2bad7bd799af45083750a73b209049869fcd68a Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Thu, 18 Feb 2016 09:03:34 -0800 Subject: [PATCH] etcd-agent: get base when renaming Partially related to https://github.com/coreos/etcd/issues/4552. --- tools/functional-tester/etcd-agent/agent.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/functional-tester/etcd-agent/agent.go b/tools/functional-tester/etcd-agent/agent.go index a502e18a8..4daa052b1 100644 --- a/tools/functional-tester/etcd-agent/agent.go +++ b/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 }