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

[Norbert Thiebaud]

 solenv/bin/modules/installer/filelists.pm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 38a3edb2bea08939234300b53cdf6ab4222847e1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Nov 4 19:58:41 2013 -0600

    bug in perl installer that make UnixLink entries to be lost
    
    the code in question try to re-assign entry that are in normal file
    to links based on some condiftion... but when it did that
    it would overwrite the content of the array that was passed
    instead of adding to it, hence loosing any Unixlink entries.
    
    Change-Id: Ia879dfefa4bf2fc635c05864b014e0712e51812d
    Reviewed-on: https://gerrit.libreoffice.org/6574
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm
index 8c0231a..bf9dc2f 100644
--- a/solenv/bin/modules/installer/filelists.pm
+++ b/solenv/bin/modules/installer/filelists.pm
@@ -81,7 +81,7 @@ sub resolve_filelist_flag
                         # get_Destination_Directory_For_Item_From_Directorylist
                         $newfile{'DoNotMessWithSymlinks'} = 1;
                         $newfile{'Target'} = readlink($path);
-                        push @links, \%newfile;
+                        push ( @{$links}, \%newfile );
                     }
                     else
                     {
@@ -106,7 +106,7 @@ sub resolve_filelist_flag
         }
     }
 
-    return (\@newfiles, \@links);
+    return (\@newfiles, $links);
 }
 
 sub read_filelist