From: Jacob Bachmeyer <jcb@gnu.org>
Date: Thu, 17 Nov 2022 02:17:45 +0000 (-0600)
Subject: Fix message describing replacement of a file
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5d420fcfbbc2ef6471593dab4758ff53a0a1fcb9;p=gatekeeper.git

Fix message describing replacement of a file

This message is written to the log before the file has even been moved to
the staging directory, therefore it should not be past tense.
---

diff --git a/gatekeeper.pl b/gatekeeper.pl
index ee69758..4c2ab37 100755
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -2481,7 +2481,7 @@ sub install_files {
     if ($header->{options}{replace}) {
       archive_filepair([File::Spec::Unix->splitdir($header->{directory})],
 		       $upload_file);
-      ftp_syslog('info', "overwrote $pubfinal with uploaded version");
+      ftp_syslog('info', "overwriting $pubfinal with uploaded version");
       $notification_str .=
 	"Archived and overwrote $pubfinal with uploaded version\n";
     } else {
diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index ca56dcf..fb35dc0 100644
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -844,8 +844,8 @@ proc analyze_log { base_dir name assess } {
 		     exp_continue
 		 }
 	-re {^gatekeeper\[[0-9]+\]: \(Test\) \[EX\]\
-		 overwrote [^\r\n]+} {
-		     # from install_files, if target replaced
+		 overwriting [^\r\n]+} {
+		     # from install_files, if target is to be replaced
 		     set A(install,target-file-replaced) 1
 		     exp_continue
 		 }