From 28db1792213f363bcb95ab0ab4a1fd838002c44d Mon Sep 17 00:00:00 2001 From: "mattwillis%gmail.com" Date: Mon, 5 Feb 2007 18:20:10 +0000 Subject: [PATCH] backing out bug 355465. >:( --- tools/tinderbox/post-mozilla-rel.pl | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/tools/tinderbox/post-mozilla-rel.pl b/tools/tinderbox/post-mozilla-rel.pl index 8a0d08b1c4d8..80fb4bf0410a 100755 --- a/tools/tinderbox/post-mozilla-rel.pl +++ b/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");