safer way

Author: reimannf

pkg/objects/file.go

@@ -160,15 +160,17 @@ func (f File) uploadNormalObject(body io.Reader, sourceState FileState, hdr swif
 	if serr, ok := err.(*swift.Error); ok {
 		//upload failed due to rate limit, object is definitely not uploaded
 		//prevent additional rate limit caused by an unnecessary delete request
-		if serr.StatusCode != 498 {
-			//delete potentially incomplete upload
-			err = f.Job.Target.Connection.ObjectDelete(containerName, objectName)
-			if err != nil {
-				util.Log(util.LogError, "DELETE %s/%s failed: %s", containerName, objectName, err.Error())
-			}
+		if serr.StatusCode == 498 {
+			return false
 		}
 	}
 
+	//delete potentially incomplete upload
+	err = f.Job.Target.Connection.ObjectDelete(containerName, objectName)
+	if err != nil {
+		util.Log(util.LogError, "DELETE %s/%s failed: %s", containerName, objectName, err.Error())
+	}
+
 	return false
 }