diff options
| -rwxr-xr-x | CVSROOT/cfg.pm | 9 | ||||
| -rwxr-xr-x | CVSROOT/commit_prep.pl | 16 |
2 files changed, 10 insertions, 15 deletions
diff --git a/CVSROOT/cfg.pm b/CVSROOT/cfg.pm index 6816197d2993..d7b2ce0fa8fe 100755 --- a/CVSROOT/cfg.pm +++ b/CVSROOT/cfg.pm @@ -12,7 +12,7 @@ package cfg; use strict; use vars qw($DEBUG $FILE_PREFIX $MAILADDRS $MAILBANNER $MAILCMD $MAIL_ON_DIR_CREATION $TMPDIR %TEMPLATE_HEADERS - $LAST_FILE $PID $IDHEADER $UNEXPAND_RCSID); + $CHECK_HEADERS $LAST_FILE $PID $IDHEADER $UNEXPAND_RCSID); ###################### @@ -62,6 +62,13 @@ $LAST_FILE = "$TMPDIR/$FILE_PREFIX.lastdir"; ### commit_prep.pl ### ###################### +# Check for instances of $IDHEADER in committed files, and +# bomb out if they're not present, or corrupted. +# Exclusions can be specified in the CVSROOT/exclude file. +# Currently $IDHEADER must be an instance of $CVSHeader$, or an alias +# defined in CVSROOT/options. +$CHECK_HEADERS = 1; + # 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 f937dad6297a..0cdb22722bb8 100755 --- a/CVSROOT/commit_prep.pl +++ b/CVSROOT/commit_prep.pl @@ -29,16 +29,6 @@ use strict; use lib $ENV{CVSROOT}; use CVSROOT::cfg; -############################################################ -# -# Configurable options -# -############################################################ -# -# Check each file (except dot files) for our RCS header keyword. -# (defined in the constants section.) -# -my $check_id = 0; ############################################################ # @@ -272,9 +262,7 @@ shift @ARGV; $directory =~ s,^$cvsroot[/]+,,; -if ($directory =~ /^src/) { - $check_id = 1; -} +my $check_id = 0; if ($directory =~ /^ports/) { $check_id = 2; } @@ -287,7 +275,7 @@ if ($directory =~ /^src\/crypto/) { # # Now check each file name passed in, except those excluded. # -if ($check_id != 0) { +if ($cfg::CHECK_HEADERS) { my $failed = 0; foreach my $arg (@ARGV) { my $hastag = ($cvstag{$arg} ne ''); |