Bug 1263073 - partner repacks should not block other uploads r=nthomas a=release DONTBUILD

MozReview-Commit-ID: 69DSyJrB6hI

--HG--
extra : rebase_source : 90cfc160c1c4559051305db35b3de904d5ee9f64

testing/mozharness/scripts/release/push-candidate-to-releases.py

@@ -149,18 +149,28 @@ class ReleasePusher(BaseScript, VirtualenvMixin):
         self.info("Checking destination {} is empty".format(self._get_releases_prefix()))
         keys = [k for k in bucket.list(prefix=self._get_releases_prefix())]
         if keys:
-            self.fatal("Destination already exists with %s keys, aborting" %
+            self.warning("Destination already exists with %s keys" % len(keys))
-                       len(keys))
 
         def worker(item):
             source, destination = item
 
-            self.info("Copying {} to {}".format(source, destination))
+            def copy_key():
-            return retry(bucket.copy_key,
+                dest_key = bucket.get_key(destination)
-                         args=(destination,
+                source_key = bucket.get_key(source)
-                               self.config["bucket_name"],
+                if not dest_key:
-                               source),
+                    self.info("Copying {} to {}".format(source, destination))
-                         sleeptime=5, max_sleeptime=60,
+                    bucket.copy_key(destination, self.config["bucket_name"],
+                                    source)
+                elif source_key.etag == dest_key.etag:
+                    self.warning(
+                        "{} already exists with the same content ({}), skipping copy".format(
+                            destination, dest_key.etag))
+                else:
+                    self.fatal(
+                        "{} already exists with the different content (src: {}, dest: {}), aborting".format(
+                            destination, source_key.etag, dest_key.etag))
+
+            return retry(copy_key, sleeptime=5, max_sleeptime=60,
                          retry_exceptions=(S3CopyError, S3ResponseError))
 
         def find_release_files():