From: Jacob Bachmeyer <jcb@gnu.org>
Date: Wed, 29 Mar 2023 03:05:26 +0000 (-0500)
Subject: Rename "maintainermap" configuration item to "maintainerlist"
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b9d299af0dcce8d9aec50a3879df80466902b7ec;p=gatekeeper.git

Rename "maintainermap" configuration item to "maintainerlist"
---

diff --git a/gatekeeper.pl b/gatekeeper.pl
index b38edbb..d62b66b 100755
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -294,7 +294,7 @@ BEGIN {
   my $c_Log_Tag = '';		# CONF_Log_Tag
   my $c_Zone_Tag = '';		# CONF_Zone_Tag
   my $c_Email_Blacklist;	# CONF_Email_Blacklist
-  my $c_Email_MaintainerMap;	# CONF_Email_Maintainers
+  my $c_Email_MaintainerList;	# CONF_Email_Maintainers
   my $c_Email_SourceAddress;	# CONF_Email_SourceAddress
   my $c_Email_ReturnAddress;	# CONF_Email_ReturnAddress
   my $c_Email_ArchiveBox;	# CONF_Email_PublicArchive
@@ -319,7 +319,7 @@ BEGIN {
       my $base = $1;		# untainted
 
       $c_Email_Blacklist   =	File::Spec->catfile($base, 'email.blacklist');
-      $c_Email_MaintainerMap =	File::Spec->catfile($base, 'm.bypkg');
+      $c_Email_MaintainerList =	File::Spec->catfile($base, 'm.bypkg');
 
       $c_Email_SourceAddress = 'ftp-upload-script@gnu.org';
       $c_Email_ReturnAddress = 'ftp-upload@gnu.org';
@@ -380,7 +380,7 @@ BEGIN {
       }
 
       $c_Email_Blacklist = $EmailConfig{blacklist};
-      $c_Email_MaintainerMap = $EmailConfig{maintainermap};
+      $c_Email_MaintainerList = $EmailConfig{maintainerlist};
 
       $c_Email_SourceAddress = $EmailConfig{sourcebox};
       $c_Email_ReturnAddress = $EmailConfig{returnbox};
@@ -419,16 +419,16 @@ BEGIN {
 			[publicdir => $c_dir_Public],
 			[archivedir => $c_dir_Archive])
 	{ print $item->[0],' = ',$item->[1],"\n" if $item->[1] }
-      if ($c_Email_Blacklist || $c_Email_MaintainerMap
+      if ($c_Email_Blacklist || $c_Email_MaintainerList
 	  || $c_Email_SourceAddress || $c_Email_ReturnAddress
 	  || $c_Email_ArchiveBox || $c_Email_InternalBox) {
 	print "\n[email]\n";
 	print "blacklist = $c_Email_Blacklist\n"
 	  if $c_Email_Blacklist;
-	print "maintainermap = $c_Email_MaintainerMap\n"
-	  if $c_Email_MaintainerMap;
+	print "maintainerlist = $c_Email_MaintainerList\n"
+	  if $c_Email_MaintainerList;
 	print "\n"
-	  if ($c_Email_Blacklist || $c_Email_MaintainerMap)
+	  if ($c_Email_Blacklist || $c_Email_MaintainerList)
 	    && ($c_Email_SourceAddress || $c_Email_ReturnAddress);
 	print "sourcebox = $c_Email_SourceAddress\n"
 	  if $c_Email_SourceAddress;
@@ -471,7 +471,7 @@ BEGIN {
   constant->import(CONF_Zone_Tag => $c_Zone_Tag);
 
   constant->import(CONF_Email_Blacklist => $c_Email_Blacklist);
-  constant->import(CONF_Email_Maintainers => $c_Email_MaintainerMap || '');
+  constant->import(CONF_Email_Maintainers => $c_Email_MaintainerList || '');
   constant->import(CONF_Email_SourceAddress => $c_Email_SourceAddress);
   constant->import(CONF_Email_ReturnAddress =>
 		   $c_Email_ReturnAddress || $c_Email_SourceAddress);
diff --git a/testsuite/gatekeeper.all/20_config.exp b/testsuite/gatekeeper.all/20_config.exp
index c169036..428f784 100644
--- a/testsuite/gatekeeper.all/20_config.exp
+++ b/testsuite/gatekeeper.all/20_config.exp
@@ -159,7 +159,7 @@ set configuration_file(basic-email) $configuration_file(basic)
 append configuration_file(basic-email) {
 [email]
 blacklist = /srv/gatetest/config/email.blacklist
-maintainermap = /srv/gatetest/config/maintainers.bypkg
+maintainerlist = /srv/gatetest/config/maintainers.bypkg
 
 sourcebox = upload-handler@example.org
 returnbox = upload-admin@example.org
@@ -184,7 +184,7 @@ do_configuration_test "parse basic configuration with email" basic-email.conf \
 
 	    {\[email\][\r\n]+blacklist =}
 	    {blacklist = /srv/gatetest/config/email.blacklist}
-	    {maintainermap = /srv/gatetest/config/maintainers.bypkg}
+	    {maintainerlist = /srv/gatetest/config/maintainers.bypkg}
 	    {archivebox = public@example.org}
 	    {internalbox = internal@example.org}
 	}
@@ -195,12 +195,12 @@ proc run_email_option_coverage_test {} {
 
     for { set i 0 } { $i <= 63 } { incr i } {
 	set cnf $configuration_file(basic-email)
-	if { $i & 1<<0 } { regsub -line {^blacklist = .*\n}     $cnf "" cnf }
-	if { $i & 1<<1 } { regsub -line {^maintainermap = .*\n} $cnf "" cnf }
-	if { $i & 1<<2 } { regsub -line {^sourcebox = .*\n}	$cnf "" cnf }
-	if { $i & 1<<3 } { regsub -line {^returnbox = .*\n}	$cnf "" cnf }
-	if { $i & 1<<4 } { regsub -line {^archivebox = .*\n}    $cnf "" cnf }
-	if { $i & 1<<5 } { regsub -line {^internalbox = .*\n}   $cnf "" cnf }
+	if { $i & 1<<0 } { regsub -line {^blacklist = .*\n}      $cnf "" cnf }
+	if { $i & 1<<1 } { regsub -line {^maintainerlist = .*\n} $cnf "" cnf }
+	if { $i & 1<<2 } { regsub -line {^sourcebox = .*\n}	 $cnf "" cnf }
+	if { $i & 1<<3 } { regsub -line {^returnbox = .*\n}	 $cnf "" cnf }
+	if { $i & 1<<4 } { regsub -line {^archivebox = .*\n}     $cnf "" cnf }
+	if { $i & 1<<5 } { regsub -line {^internalbox = .*\n}    $cnf "" cnf }
 	do_configuration_test \
 	    "email configuration coverage $i" "email-$i.conf" $cnf {} {0 {}}
     }