Remove --cf-invalidate arguments that do nothing

Author: brson

master/master.cfg

@@ -1256,13 +1256,13 @@ def finish_dist(f, local_dist_dir, dist_subdirs, s3_addy, remote_dist_dir, compo
     if upload:
         # Upload everything to S3, first to the archive
         s3dir = s3_addy + "/" + remote_dist_dir + "/`date +'%Y-%m-%d'`/"
-        s3cmd = "s3cmd put -P --cf-invalidate --no-progress " + final_dist_dir + "/* " + s3dir
+        s3cmd = "s3cmd put -P --no-progress " + final_dist_dir + "/* " + s3dir
         f.addStep(MasterShellCommand(name="s3 archive upload",
                                      command=["sh", "-c", s3cmd]))
 
         # Then to the primary dist directory
         s3dir = s3_addy + "/" + remote_dist_dir + "/"
-        s3cmd = "s3cmd put -P --cf-invalidate --no-progress " + final_dist_dir + "/* " + s3dir
+        s3cmd = "s3cmd put -P --no-progress " + final_dist_dir + "/* " + s3dir
         f.addStep(MasterShellCommand(name="s3 primary upload",
                                      command=["sh", "-c", s3cmd]))
 
@@ -1357,7 +1357,7 @@ def packaging_dist_buildfactory(platform, channel_label):
                        flunkOnFailure=False))
 
     # Require a manual upload for the stable channel
-    upload = channel != "stable"
+    upload = channel_label != "stable"
     return finish_dist(f, local_dist_dir, dist_platforms, s3_addy, "dist", "rust", channel_label, upload)
 
 c['builders'] = []