From: Jacob Bachmeyer <jcb@gnu.org>
Date: Wed, 16 Nov 2022 01:01:46 +0000 (-0600)
Subject: Improve reporting of overwrites when installing files
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=198ea49c70707701800def8c4e26cab34308bb6f;p=gatekeeper.git

Improve reporting of overwrites when installing files

The reported name is now the logical name in the published tree instead of
the actual name on the server's filesystem.
---

diff --git a/gatekeeper.pl b/gatekeeper.pl
index 9d134cf..85dd8cf 100755
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -2466,7 +2466,7 @@ sub install_files {
   my $stage_upload = File::Spec->catfile($Stage_dir, $upload_file);
   my $stage_signature = File::Spec->catfile($Stage_dir, $sig_file);
 
-  my $pubfinal = File::Spec::Unix->catfile(@directory, $install_as);
+  my $pubfinal = File::Spec::Unix->catfile(pub => @directory, $install_as);
   my $final_upload = File::Spec->catfile
     ($Public_dir, @directory, $install_as);
   my $final_signature = File::Spec->catfile
@@ -2481,9 +2481,9 @@ sub install_files {
     if ($header->{options}{replace}) {
       archive_filepair([File::Spec::Unix->splitdir($header->{directory})],
 		       $upload_file);
-      ftp_syslog('info', "overwrote $final_upload with uploaded version");
+      ftp_syslog('info', "overwrote $pubfinal with uploaded version");
       $notification_str .=
-	"Archived and overwrote $final_upload with uploaded version\n";
+	"Archived and overwrote $pubfinal with uploaded version\n";
     } else {
       throw processing_error => command => $step,
 	summary => $pubfinal." exists and 'replace' was not selected";