solenv/bin/modules/installer/scriptitems.pm | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 500def307635fc4359c542df60a963da23225b54
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Nov 10 18:05:41 2023 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Nov 10 21:37:32 2023 +0100
Improve error logging in remove_Files_Without_Sourcedirectory
Change-Id: I7ed7c08bd57bb5d1b11bc7c029decd571a6758f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159236
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 0c374054895d..54f3618d1078 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1132,8 +1132,7 @@ sub remove_Files_Without_Sourcedirectory
my $infoline;
my $error_occurred = 0;
- my @missingfiles = ();
- push(@missingfiles, "ERROR: The following files could not be found: \n");
+ my $missingfiles = "The following files could not be found:\n";
my @newfilesarray = ();
@@ -1152,7 +1151,7 @@ sub remove_Files_Without_Sourcedirectory
$infoline = "ERROR: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline);
- push(@missingfiles, "ERROR: File not found: $filename\n");
+ $missingfiles = "$missingfiles $filename\n";
$error_occurred = 1;
next; # removing this file from list, if sourcepath is empty
@@ -1164,7 +1163,7 @@ sub remove_Files_Without_Sourcedirectory
$infoline = "ERROR: Removing file $filename from file
list.\n";
push( @installer::globals::logfileinfo, $infoline);
- push(@missingfiles, "ERROR: File not found: $filename\n");
+ $missingfiles = "$missingfiles $filename\n";
$error_occurred = 1;
next; # removing this file from list, if sourcepath is
empty
@@ -1186,7 +1185,7 @@ sub remove_Files_Without_Sourcedirectory
$infoline = "ERROR: Removing file $filename from file
list.\n";
push( @installer::globals::logfileinfo, $infoline);
- push(@missingfiles, "ERROR: File not found: $filename\n");
+ $missingfiles = "$missingfiles $filename\n";
$error_occurred = 1;
next; # removing this file from list, if sourcepath is
empty
@@ -1211,8 +1210,7 @@ sub remove_Files_Without_Sourcedirectory
if ( $error_occurred )
{
- for ( my $i = 0; $i <= $#missingfiles; $i++ ) { print
"$missingfiles[$i]"; }
- installer::exiter::exit_program("ERROR: Missing files",
"remove_Files_Without_Sourcedirectory");
+ installer::exiter::exit_program($missingfiles,
"remove_Files_Without_Sourcedirectory");
}
return \@newfilesarray;
