summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2005-07-29 11:25:10 +0000
committerdes <des@FreeBSD.org>2005-07-29 11:25:10 +0000
commit59a8e9095cf8a3790405749f90a2e6a2ed6c50ce (patch)
tree47c5e07579323359d59b5e5a5737235e8a93c986 /tools
parent1e2d73f44330c8f42e9f3371f1f670638fd666ac (diff)
downloadFreeBSD-src-59a8e9095cf8a3790405749f90a2e6a2ed6c50ce.zip
FreeBSD-src-59a8e9095cf8a3790405749f90a2e6a2ed6c50ce.tar.gz
Differentiate between empty and short reports, and raise the bar for what
we consider a short report to 128 characters. Canonicalize %%HOME%%.
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/tinderbox/tbmaster.pl8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 0ae6be0..b48545f 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -206,7 +206,11 @@ sub report($$$$) {
my $subject = shift;
my $message = shift;
- if (length($message) < 64) {
+ if (!$message) {
+ print(STDERR "[empty report, not sent by email]\n\n]");
+ return;
+ }
+ if (length($message) < 128) {
print(STDERR "[suspiciously short report, not sent by email]\n\n");
print(STDERR $message);
return;
@@ -512,7 +516,7 @@ MAIN:{
$INITIAL_CONFIG{'HOSTNAME'} = 'unknown';
}
if ($ENV{'HOME'} =~ m/^((?:\/[\w\.-]+)+)\/*$/) {
- $INITIAL_CONFIG{'HOME'} = $1;
+ $INITIAL_CONFIG{'HOME'} = realpath($1);
$etcdir = "$1/etc";
$ENV{'PATH'} = "$1/bin:$ENV{'PATH'}"
if (-d "$1/bin");
OpenPOWER on IntegriCloud