Log die message to the end after bsdcons has spamed the log file.

Logcmd.pm

@@ -23,10 +23,11 @@ use File::Copy;
 use POSIX;
 
 use parent 'Exporter';
-our @EXPORT= qw(createlog logmsg logeval runcmd forkcmd waitcmd logcmd loggrep);
+our @EXPORT= qw(createlog relogdie logmsg logeval runcmd forkcmd waitcmd logcmd
+    loggrep);
 use subs qw(logmsg);
 
-my ($fh, $file, $verbose);
+my ($fh, $file, $verbose, @diemsg);
 sub createlog {
     my %args = @_;
     $file = $args{file};
@@ -39,10 +40,17 @@ sub createlog {
 
     $SIG{__DIE__} = sub {
 	print $fh @_ if $fh;
+	@diemsg = @_;
 	die @_;
     };
 }
 
+sub relogdie {
+    return unless @diemsg;
+    print $fh @diemsg if $fh;
+    print @diemsg if $verbose;
+}
+
 sub logmsg {
     print $fh @_ if $fh;
     print @_ if $verbose;

once.pl

@@ -155,8 +155,11 @@
 # do not run end block until initialized, date may change later
 my $odate = $date;
 END {
-    bsdcons_hosts(cvsdate => $cvsdate, patch => $patch, modify => $modify,
-	release => $release) if $odate;
+    if ($odate) {
+	bsdcons_hosts(cvsdate => $cvsdate, patch => $patch, modify => $modify,
+	    release => $release);
+	relogdie();
+    }
     my @cmd = ("$performdir/bin/setup-html.pl");
     system(@cmd) if $performdir;
     @cmd = ("$performdir/bin/running-html.pl");

run.pl

@@ -103,7 +103,10 @@
 # do not run end block until initialized, date may change later
 my $odate = $date;
 END {
-    bsdcons_hosts() if $odate;
+    if ($odate) {
+	bsdcons_hosts();
+	relogdie();
+    }
     my @cmd = ("$regressdir/bin/setup-html.pl");
     system(@cmd) if $regressdir;
     @cmd = ("$regressdir/bin/running-html.pl");

step.pl

@@ -172,7 +172,10 @@
 # do not run end block until initialized, date may change later
 my $odate = $date;
 END {
-    bsdcons_hosts(release => $release) if $odate;
+    if ($odate) {
+	bsdcons_hosts(release => $release);
+	relogdie();
+    }
     my @cmd = ("$performdir/bin/setup-html.pl");
     system(@cmd) if $performdir;
     @cmd = ("$performdir/bin/running-html.pl");