From b823f6066d576b102a37c53c4d3d74db35d561a5 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 1 Oct 2021 13:06:57 -1000 Subject: [PATCH] Bug 29156: File missing warning in Koha::UploadedFile for permanent files only When an uploaded file is deleted, when file does not exist there is a warning : "Removing record for file.txt within category koha_upload, but file was missing." For temporary files, this warning is noisy. For example when they are in /tmp, system reboot deleted them. I propose to remove this warning for temporary files. Test plan : 1) Upload a temporary and a permanent file via Tools > Upload 2) Delete the file on server 3) Delete the two files from Tools > Upload 4) Look at warning in log files => You see only warning for permanent file Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Fridolin Somers Signed-off-by: Kyle M Hall (cherry picked from commit 874ad0729e15cb264a9222fbc01464eefca9ee1c) Signed-off-by: Andrew Fuerste-Henry --- Koha/UploadedFile.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Koha/UploadedFile.pm b/Koha/UploadedFile.pm index 009c333a8d..13ec2eaadb 100644 --- a/Koha/UploadedFile.pm +++ b/Koha/UploadedFile.pm @@ -78,8 +78,10 @@ sub delete { return $retval if $params->{keep_file}; if( ! -e $file ) { - warn "Removing record for $name within category ". - $self->uploadcategorycode. ", but file was missing."; + if ( $self->permanent ) { + warn "Removing record for $name within category ". + $self->uploadcategorycode. ", but file was missing."; + } } elsif( ! unlink($file) ) { warn "Problem while deleting: $file"; } -- 2.39.5