From 993e370f92490c09da73f055a4c1ee309dcaddc8 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sun, 2 Jul 2017 10:47:50 +0200
Subject: [PATCH] s3 migrate layout: Ignore already renamed files

---
 src/restic/backend/s3/s3.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/restic/backend/s3/s3.go b/src/restic/backend/s3/s3.go
index 202a39baf..2de495403 100644
--- a/src/restic/backend/s3/s3.go
+++ b/src/restic/backend/s3/s3.go
@@ -462,6 +462,11 @@ func (be *Backend) Rename(h restic.Handle, l backend.Layout) error {
 
 	coreClient := minio.Core{Client: be.client}
 	err := coreClient.CopyObject(be.cfg.Bucket, newname, path.Join(be.cfg.Bucket, oldname), minio.CopyConditions{})
+	if err != nil && be.IsNotExist(err) {
+		debug.Log("copy failed: %v, seems to already have been renamed", err)
+		return nil
+	}
+
 	if err != nil {
 		debug.Log("copy failed: %v", err)
 		return err