Browse code

Move cmd - take care in that copy s3 xml result can be a multipart copy result

Florent Viard authored on 2020/04/14 06:27:58
Showing 1 changed files
... ...
@@ -953,11 +953,14 @@ class S3(object):
953 953
                     extra_label=""):
954 954
         response_copy = self.object_copy(src_uri, dst_uri, extra_headers)
955 955
         debug("Object %s copied to %s" % (src_uri, dst_uri))
956
-        if not response_copy["data"] or getRootTagName(response_copy["data"]) == "CopyObjectResult":
956
+        if not response_copy["data"] \
957
+           or getRootTagName(response_copy["data"]) \
958
+              in ["CopyObjectResult", "CompleteMultipartUploadResult"]:
957 959
             self.object_delete(src_uri)
958 960
             debug("Object '%s' deleted", src_uri)
959 961
         else:
960
-            debug("Object '%s' NOT deleted because of an unexepected response data content.", src_uri)
962
+            warning("Object '%s' NOT deleted because of an unexpected "
963
+                    "response data content.", src_uri)
961 964
         return response_copy
962 965
 
963 966
     def object_info(self, uri):