Back out mattwillis' fix for bug 355465; perl -c is your friend.

tools/tinderbox/post-mozilla-rel.pl

@@ -74,13 +74,8 @@ sub mail_locale_started_message {
 
     my $platform = $Settings::OS =~ /^WIN/ ? 'windows' : 'unix';
 
-    my $tree = $Settings::BuildTree;
-    if (defined($Settings::LocaleTree)) {
-        $tree = $Settings::LocaleTree;
-    }
-
     print_locale_log "\n";
-    print_locale_log "tinderbox: tree: $tree-$locale\n";
+    print_locale_log "tinderbox: tree: $Settings::BuildTree-$locale\n";
     print_locale_log "tinderbox: builddate: $start_time\n";
     print_locale_log "tinderbox: status: building\n";
     print_locale_log "tinderbox: build: $Settings::BuildName $locale\n";
@@ -109,15 +104,10 @@ sub mail_locale_finished_message {
 
     my $platform = $Settings::OS =~ /^WIN/ ? 'windows' : 'unix';
 
-    my $tree = $Settings::BuildTree;
-    if (defined($Settings::LocaleTree)) {
-        $tree = $Settings::LocaleTree;
-    }
-
     # Put the status at the top of the log, so the server will not
     # have to search through the entire log to find it.
     print OUTLOG "\n";
-    print OUTLOG "tinderbox: tree: $tree-$locale\n";
+    print OUTLOG "tinderbox: tree: $Settings::BuildTree-$locale\n";
     print OUTLOG "tinderbox: builddate: $start_time\n";
     print OUTLOG "tinderbox: status: $build_status\n";
     print OUTLOG "tinderbox: build: $Settings::BuildName $locale\n";
@@ -917,13 +907,8 @@ sub packit_l10n {
 
   } # foreach
 
-  # remove en-US files if directed so we don't overwrite them on upload.
-  if ($Settings::DeleteEnUsOnLocalesUpload) {
-    my $rv = unlink(glob "${stagedir}/*en-US*", glob "${stagedir}/*-xpi");
-    if (! $rv) {
-      die ("Couldn't delete en-US!");
-    }
-  }
+  # remove en-US files since we're building that on a different system
+  TinderUtils::run_shell_command("rm -f $stagedir/*en-US* $stagedir/*-xpi");
 
   TinderUtils::print_log("locales completed.\n");
 

tools/tinderbox/tinder-defaults.pl

@@ -180,18 +180,6 @@ $BuildSleep = 10;
 #- change to the tree you're actually building
 $BuildTree  = 'MozillaTest';
 
-#- If you're building locales and would like locale messages reported to a
-#- tree other than $BuildTree-ab-CD, define the tree here. -ab-CD will be
-#- appended for you.
-#$LocaleTree = '';
-
-#- By default, locale builds delete the wget-ed en-US build from the local
-#- stage directory before rsyncing the freshly baked l10n builds up to the
-#- FTP server.  This prevents the rsync from accidentally overwriting the
-#- already existing en-US build on the FTP server.  This behaviour is most
-#- useful when building en-US and the other locales on different machines.
-$DeleteEnUsOnLocalesUpload = 1;
-
 $BuildName = '';
 $BuildTag = '';
 $BuildConfigDir = 'mozilla/config';