From 5cc5429f998fcfa2c363dd64ed61481ac25be21a Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Sat, 14 Mar 2015 17:54:41 +0000
Subject: [PATCH] drive: switch to insert from update when a failed copy
 deletes the upload

---
 fs/operations.go | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/fs/operations.go b/fs/operations.go
index a63616d38..768328255 100644
--- a/fs/operations.go
+++ b/fs/operations.go
@@ -109,14 +109,19 @@ func MimeType(o Object) string {
 }
 
 // Used to remove a failed copy
-func removeFailedCopy(dst Object) {
-	if dst != nil {
-		Debug(dst, "Removing failed copy")
-		removeErr := dst.Remove()
-		if removeErr != nil {
-			Debug(dst, "Failed to remove failed copy: %s", removeErr)
-		}
+//
+// Returns whether the file was succesfully removed or not
+func removeFailedCopy(dst Object) bool {
+	if dst == nil {
+		return false
 	}
+	Debug(dst, "Removing failed copy")
+	removeErr := dst.Remove()
+	if removeErr != nil {
+		Debug(dst, "Failed to remove failed copy: %s", removeErr)
+		return false
+	}
+	return true
 }
 
 // Copy src object to dst or f if nil
@@ -150,7 +155,11 @@ tryAgain:
 	if r, ok := err.(Retry); ok && r.Retry() && tries < maxTries {
 		tries++
 		Log(src, "Received error: %v - retrying %d/%d", err, tries, maxTries)
-		removeFailedCopy(dst)
+		if removeFailedCopy(dst) {
+			// If we removed dst, then nil it out and note we are not updating
+			dst = nil
+			doUpdate = false
+		}
 		goto tryAgain
 	}
 	if err == nil {