diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-30 12:39:27 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-30 12:15:33 +0100 |
| commit | 347fa47507fce9758b60d9126a1beed04c45dc35 (patch) | |
| tree | 4031c10d81b4024f57c10f588c4976246ba068fe /solenv/bin/modules/installer.pm | |
| parent | cd14cd07b9252cab0f23949043ae93b9fe85b5c0 (diff) | |
Fix errors in scriptitems.pm found by 'use strict'
Besides some stylistic changes (adding 'my' in due places), this
fixes two errors:
1. An omission from commit cb02ea85db6f38b792c17f5f971f81a28b595b4e
Date Fri Oct 13 09:36:29 2006 +0000
INTEGRATION: CWS native62 (1.28.42); FILE MERGED
not passing '$allvariableshashref' to 'replace_userdir_variable',
and so using a local empty variable instead, ignoring custom value
of LOCALUSERDIR in *.lst;
2. Use of wrong scalar variable '$alldirectoryhash' instead of hash
'%alldirectoryhash' in 'collect_directories_from_filesarray', from
commit 8c6467a785037309d2a2cec56c8e38cf52da0aee
Date Sat Oct 29 23:38:12 2022 +0300
MSI: fix handling empty directories
which resulted in the loss of empty directories found by that call.
Change-Id: I126575a51044186bc6c7fdf898942abf71ddb4b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142034
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv/bin/modules/installer.pm')
| -rw-r--r-- | solenv/bin/modules/installer.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 99866b2fb7f2..071d31b13b14 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -714,7 +714,7 @@ sub run { # ancient (not MSP) "patch" thing, I think. if ( $installer::globals::patch_user_dir ) { - installer::scriptitems::replace_userdir_variable($profileitemsinproductlanguageresolvedarrayref); + installer::scriptitems::replace_userdir_variable($profileitemsinproductlanguageresolvedarrayref, $allvariableshashref); } installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($profilesinproductlanguageresolvedarrayref, $dirsinproductarrayref); |