$all_stat $fail_stat $change_stat $green_stat
$server_time
$min_script_version $min_web_script_version
+ $default_host
);
# force this before we do anything - even load modules
my $mailto = [@$all_stat];
push(@$mailto,@$fail_stat) if $stage ne 'OK';
-my $me = `id -un`; chomp $me;
+my $me = `id -un`; chomp($me);
-my $host = `hostname`; chomp $host;
+my $host = `hostname`; chomp ($host);
+$host = $default_host unless ($host =~ m/[.]/ || !defined($default_host));
+
+my $from_addr = "PG Build Farm <$me\@$host>";
+$from_addr =~ tr /\r\n//d;
my $msg = new Mail::Send;
-$msg->set('From',"PG Build Farm <$me\@$host>");
$msg->to(@$mailto);
$msg->bcc(@$bcc_stat) if (@$bcc_stat);
$msg->subject("PGBuildfarm member $animal Branch $branch $stat_type $stage");
+$msg->set('From',$from_addr);
my $fh = $msg->open;
print $fh <<EOMAIL;
$msg = new Mail::Send;
-$msg->set('From',"PG Build Farm <$me\@$host>");
$msg->to(@$mailto);
$msg->bcc(@$bcc_chg) if (@$bcc_chg);
$stat_type .= " failure" if $stage ne 'OK';
$msg->subject("PGBuildfarm member $animal Branch $branch Status $stat_type");
+$msg->set('From',$from_addr);
$fh = $msg->open;
print $fh <<EOMAIL;