Add a config option $WARN_HEADERS to only warn when the $ HEADER $

isn't present or corrupted, instead of bombing out.

Submitted by:	Mathieu Arnold <arn_mat@club-internet.fr>

2 files changed, 9 insertions, 7 deletions

diff --git a/CVSROOT/cfg.pm b/CVSROOT/cfg.pm
index 3931c955e4bd..81721f06bf77 100755
--- a/CVSROOT/cfg.pm
+++ b/CVSROOT/cfg.pm
@@ -14,11 +14,11 @@
 package cfg;
 use strict;
 use vars qw(
-	$ADD_TO_LINE $AVAIL_FILE $CHECK_HEADERS $COMMITCHECK_EXTRA $COMMITTER
-	$DEBUG $EXCLUDE_FILE $FILE_PREFIX $IDHEADER $LAST_FILE $MAILADDRS
-	$MAILBANNER $MAILCMD $MAIL_BRANCH_HDR $MAIL_ON_DIR_CREATION
-	$MAIL_TRANSFORM $MINCVSVERSION $PID $PROG_CVS $PROG_MV $TMPDIR
-	$UNEXPAND_RCSID %TEMPLATE_HEADERS @COMMIT_HOSTS
+	$ADD_TO_LINE $AVAIL_FILE $CHECK_HEADERS $COMMITCHECK_EXTRA
+	@COMMIT_HOSTS $COMMITTER $DEBUG $EXCLUDE_FILE $FILE_PREFIX $IDHEADER
+	$LAST_FILE $MAILADDRS $MAILBANNER $MAILCMD $MAIL_BRANCH_HDR
+	$MAIL_ON_DIR_CREATION $MAIL_TRANSFORM $MINCVSVERSION $PID $PROG_CVS
+	$PROG_MV %TEMPLATE_HEADERS $TMPDIR $UNEXPAND_RCSID $WARN_HEADERS
 );
 
 my $CVSROOT = $ENV{'CVSROOT'} || die "Can't determine \$CVSROOT!";
@@ -118,6 +118,9 @@ $AVAIL_FILE = "$CVSROOT/CVSROOT/avail";
 $CHECK_HEADERS = 0;
 $EXCLUDE_FILE = "$CVSROOT/CVSROOT/exclude";
 
+# Make a header check a non-fatal error - just warn, don't exit.
+$WARN_HEADERS = 0;
+
 # WARNING: You will also need to be running the version of cvs that
 # the FreeBSD project is using; I believe that we have some local patches
 # that aren't in the main 'cvs' source.
diff --git a/CVSROOT/commit_prep.pl b/CVSROOT/commit_prep.pl
index 007d39de7bf8..82f1ba18ecbb 100755
--- a/CVSROOT/commit_prep.pl
+++ b/CVSROOT/commit_prep.pl
@@ -286,9 +286,8 @@ if ($cfg::CHECK_HEADERS) {
 
 		# Unexpand the rcsid if required.
 		fix_up_file($arg) if $cfg::UNEXPAND_RCSID and !$failed;
-
 	}
-	if ($failed) {
+	if ($failed and not $cfg::WARN_HEADERS) {
 		print "\n";
 		unlink($cfg::LAST_FILE);
 		exit(1);