[Libreoffice-commits] core.git: solenv/bin

[Mike Kaganski (via logerrit)]

 solenv/bin/modules/installer/scriptitems.pm |   33 +++++++++++-----------------
 1 file changed, 13 insertions(+), 20 deletions(-)

New commits:
commit 1cfa0f49922aa49597bac341393c8f38309a3bae
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 3 09:35:07 2022 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Nov 3 17:23:11 2022 +0100

    Do not merge filesarrayref and unixlinksarrayref when filtering out 
directories
    
    In commit 8c6467a785037309d2a2cec56c8e38cf52da0aee, the code
    filtering out the directories was creating a new array, that
    was assigned to the function's inout filesarrayref argument;
    and that code merged non-directories from both filesarrayref
    and unixlinksarrayref.
    
    This fixes the logic to only filter filesarrayref.
    
    Change-Id: Ia00dcd3f645ba2a6c2d8ea0559627ccfe0eb232b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142195
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
    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 97b76a503f6a..0c374054895d 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1679,33 +1679,28 @@ sub add_directory_with_create_flag_hash
 sub collect_directories_from_filesarray
 {
     my ($filesarrayref, $unixlinksarrayref) = @_;
-    my @allfiles;
-    push @allfiles, @{$filesarrayref};
-    push @allfiles, @{$unixlinksarrayref};
 
     my %alldirectoryhash = ();
-    my @filteredfilesarrayref = (); # without empty directories
-
-    # Preparing this already as hash, although the only needed value at the 
moment is the HostName
-    # But also adding: "specificlanguage" and "Dir" (for instance 
gid_Dir_Program)
-
-    for ( my $i = 0; $i <= $#allfiles; $i++ )
+    my @filteredfilesarray = (); # without empty directories
+    foreach my $onefile (@{$filesarrayref})
     {
-        my $onefile = $allfiles[$i];
-        my $destinationpath = $onefile->{'destination'};
-
         # The "file" can actually be an empty directory added e.g. by 
gb_Package_add_empty_directory.
         # TODO/LATER: it would be better if gb_Package_add_empty_directory 
added empty directories to
         # "directories with CREATE flag" instead of a filelist.
         if (-d $onefile->{'sourcepath'})
         {
-            my $sourcepath = $onefile->{'sourcepath'};
             # Do the same as 
collect_directories_with_create_flag_from_directoryarray does
             %alldirectoryhash = 
%{add_directory_with_create_flag_hash(\%alldirectoryhash, 
$onefile->{'destination'}, $onefile->{'specificlanguage'}, $onefile->{'gid'}, 
"(CREATE)", $onefile->{'modules'})};
-
-            next;
         }
-        push(@filteredfilesarrayref, $onefile);
+        else { push(@filteredfilesarray, $onefile); }
+    }
+
+    # Preparing this already as hash, although the only needed value at the 
moment is the HostName
+    # But also adding: "specificlanguage" and "Dir" (for instance 
gid_Dir_Program)
+
+    foreach my $onefile (@filteredfilesarray, @{$unixlinksarrayref})
+    {
+        my $destinationpath = $onefile->{'destination'};
 
         
installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationpath);
         $destinationpath =~ s/\Q$installer::globals::separator\E\s*$//;     # 
removing ending slashes or backslashes
@@ -1746,7 +1741,7 @@ sub collect_directories_from_filesarray
         $alldirectoryhash{$destdir}->{'modules'} = 
optimize_list($alldirectoryhash{$destdir}->{'modules'});
     }
 
-    @_[0] = \@filteredfilesarrayref; # out argument
+    @_[0] = \@filteredfilesarray; # out argument
     return \%alldirectoryhash;
 }
 
@@ -1758,12 +1753,10 @@ sub 
collect_directories_with_create_flag_from_directoryarray
 {
     my ($directoryarrayref, $alldirectoryhash) = @_;
 
-    my $alreadyincluded = 0;
     my @alldirectories = ();
 
-    for ( my $i = 0; $i <= $#{$directoryarrayref}; $i++ )
+    foreach my $onedir (@{$directoryarrayref})
     {
-        my $onedir = ${$directoryarrayref}[$i];
         $alldirectoryhash = 
add_directory_with_create_flag_hash($alldirectoryhash, $onedir->{'HostName'}, 
$onedir->{'specificlanguage'}, $onedir->{'gid'}, $onedir->{'Styles'}, 
$onedir->{'modules'});
     }