Move the name of the avail file into the configuration file under the

new config variable $AVAIL_FILE.

2 files changed, 16 insertions, 8 deletions

diff --git a/CVSROOT/cfg.pm b/CVSROOT/cfg.pm
index b445d545526f..3931c955e4bd 100755
--- a/CVSROOT/cfg.pm
+++ b/CVSROOT/cfg.pm
@@ -14,11 +14,11 @@
 package cfg;
 use strict;
 use vars qw(
-	$ADD_TO_LINE $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 $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
 );
 
 my $CVSROOT = $ENV{'CVSROOT'} || die "Can't determine \$CVSROOT!";
@@ -73,6 +73,15 @@ $MINCVSVERSION = "1090900";  # 1.9.9p0
 $COMMITCHECK_EXTRA = "";
 
 
+###################
+### cvs_acls.pl ###
+###################
+
+# The name of the avail file that defines who's allow to
+# commit to what.
+$AVAIL_FILE = "$CVSROOT/CVSROOT/avail";
+
+
 ################
 ### logcheck ###
 ################
diff --git a/CVSROOT/cvs_acls.pl b/CVSROOT/cvs_acls.pl
index d47dcbde5a11..cc895d55b4bb 100755
--- a/CVSROOT/cvs_acls.pl
+++ b/CVSROOT/cvs_acls.pl
@@ -82,7 +82,6 @@ use CVSROOT::cfg;
 my $CVSROOT = $ENV{'CVSROOT'} || die "Can't determine \$CVSROOT!";
 
 my $debug = $cfg::DEBUG;
-my $availfile = "$CVSROOT/CVSROOT/avail";
 
 my $exit_val = 0;	# Good Exit value
 my $universal_off = 0;
@@ -112,9 +111,9 @@ print "$$ Repos: $repos\n","$$ ==== ",join("\n$$ ==== ",@ARGV),"\n" if $debug;
 #######################################
 
 # It is ok for the avail file not to exist.
-exit 0 unless -e $availfile;
+exit 0 unless -e $cfg::AVAIL_FILE;
 
-open (AVAIL, $availfile) || die "Can't open $availfile!\n";
+open (AVAIL, $cfg::AVAIL_FILE) || die "Can't open $cfg::AVAIL_FILE!\n";
 while (<AVAIL>) {
 	chomp;
 	next if /^\s*\#/;