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 ee69758827134b6827c9b326a8d3fa1a9fe172bd..4c2ab37f6a8578f2217e5bbf024d545c55d8c8fd 100755 (executable)
--- 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 ca56dcfe6b1b8462a66b97421207837d23974f37..fb35dc08db9caeff9fc0e01fe810676e3ca3d153 100644 (file)
--- 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
                 }