Fixup oversights in recent commits

diff --git a/gatekeeper.pl b/gatekeeper.pl
index fe83b22e9a5990f5b78f4652235f9694174b9d53..84c343c1c30d243e1c21ec9f87ee9ba1310c897b 100755 (executable)
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -401,7 +401,7 @@ gatekeeper itself and these functions may change without notice.
   # square brackets, to all messages logged.
   our $Phase = undef;          # should be set using local
 
-  # If this is set to a defined value, ftp_abort will write the message
+  # If this is set to a defined value, abort will write the message
   # here instead of using syslog.
   our $AbortPipe = undef;
   # This selects the default exit code, if no code is specified.
@@ -1276,7 +1276,7 @@ sub directory_email_addresses {
   my @addresses;
 
   foreach my $file (@email_files) {
-    open EMAIL_FILE, '<', $file or abort("open($file) failed: $!");
+    open EMAIL_FILE, '<', $file or abort "open($file) failed: $!";
     while (<EMAIL_FILE>) {
       chomp;
       push @addresses, $1
@@ -1289,7 +1289,7 @@ sub directory_email_addresses {
   my $needle = $package_name.' - ';
   my $nlen = length $needle;
   open EMAIL_FILE, '<', $maintainers_bypkg
-    or abort("open($maintainers_bypkg) failed: $!");
+    or abort "open($maintainers_bypkg) failed: $!";
   while (<EMAIL_FILE>) {
     chomp;
     next unless $needle eq substr $_,0,$nlen; # find the line for this package
@@ -1340,9 +1340,9 @@ sub exclude_mail_blacklist {
   my @filtered = @emaillist;
   if (-f $blacklist_file) {
     open BLACKLIST, '<', $blacklist_file
-      or abort("open($blacklist_file) failed: $!");
+      or abort "open($blacklist_file) failed: $!";
     while (<BLACKLIST>) { chomp; $blacklist{$_}++ }
-    close BLACKLIST or abort("close($blacklist_file) failed: $!");
+    close BLACKLIST or abort "close($blacklist_file) failed: $!";
 
     @filtered = grep !$blacklist{$_}, @emaillist;
   }
@@ -1696,7 +1696,7 @@ sub scan_incoming {
   # Get list of all possible files from incoming dir.
   #
   opendir INCOMING, $directory
-    or abort("FATAL opendir($directory) failed: $!");
+    or abort "FATAL opendir($directory) failed: $!";
  ENT: while (defined($_ = readdir INCOMING)) {
     next ENT if m/^[.]{1,2}$/; # skip . and .. entries
     # require acceptable filenames
@@ -1744,7 +1744,7 @@ sub scan_incoming {
     $possible{$ent} = 1;
   }
   closedir INCOMING
-    or abort("FATAL: closedir($directory) failed: $!");
+    or abort "FATAL: closedir($directory) failed: $!";
 
   # dispose of any garbage files
   ftp_syslog('info', "$badname_count files with bogus names were trashcanned")