backing out bug 355465. >:(

This commit is contained in:
mattwillis%gmail.com 2007-02-05 18:20:10 +00:00
parent dbf1be57b8
commit 28db179221

View File

@ -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");