Fix linux src dupes harder

Author: brson

master/master.cfg

@@ -1401,6 +1401,14 @@ def distsnap_buildfactory(platform, channel_label):
     f.addStep(MasterShellCommand(name="rm non-linux src tarballs",
                                  command=["sh", "-c", WithProperties(rm_src_tarballs_cmd)]))
 
+    # Remove the rust-src package from all but the 'linux' platform. This
+    # package is produced by all builders and if we don't drop the dupes now
+    # then the subsequent 'cp' command to consolidate them will fail.
+    non_linux_dist_dirs = [(local_dist_dir + "/" + p) for p in non_linux_platforms]
+    rm_dupes_cmd = "find " + " ".join(non_linux_dist_dirs) + " -name rust-src-" + channel + ".tar.gz | xargs rm -f"
+    f.addStep(MasterShellCommand(name="rm duplicate source packages",
+                                 command=["sh", "-c", WithProperties(rm_dupes_cmd)]))
+
     # Upload everything that's left
     f = finish_dist(f, local_dist_dir, dist_platforms, s3_addy, "dist", "rustc", channel_label, True)
 
@@ -1424,16 +1432,6 @@ def finish_dist(f, local_dist_dir, dist_subdirs, s3_addy, remote_dist_dir, compo
     f.addStep(MasterShellCommand(name="rm commit-id",
                                  command=["sh", "-c", rm_commit_ids_cmd]))
 
-    # Remove the rust-src package from all but the 'linux' platform. This
-    # package is produced by all builders and if we don't drop the dupes now
-    # then the subsequent 'cp' command to consolidate them will fail.
-    non_linux_dist_subdirs = list(dist_subdirs)
-    non_linux_dist_subdirs.remove("linux")
-    non_linux_dist_dirs = [(local_dist_dir + "/" + p) for p in non_linux_dist_subdirs]
-    rm_dupes_cmd = "find " + " ".join(non_linux_dist_dirs) + " -name rust-src-" + channel + ".tar.gz | xargs rm -f"
-    f.addStep(MasterShellCommand(name="removing duplicate source packages",
-                                 command=["sh", "-c", WithProperties(rm_dupes_cmd)]))
-
     # Consolidate everything that's left under one directory for final upload. There
     # should be no duplicate artifacts across platforms at this point.
     final_dist_dir = local_dist_dir + "/final"