summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-11-04 19:58:41 -0600
committerDavid Tardon <dtardon@redhat.com>2013-11-04 23:43:41 -0600
commit38a3edb2bea08939234300b53cdf6ab4222847e1 (patch)
tree3cd5f97d5a59ecc5ff31794cf962e045388127a9 /solenv/bin/modules/installer
parentdf21d317dacc4533ac999f3c3088765393842676 (diff)
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@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'solenv/bin/modules/installer')
-rw-r--r--solenv/bin/modules/installer/filelists.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm
index 8c0231a0d843..bf9dc2fb235a 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