[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Aug 30 10:22:10 UTC 2018


 solenv/bin/modules/installer/windows/admin.pm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 088e8bb9b7f2e60061bf1da56d83fb4537f40d67
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Aug 30 12:21:38 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 30 12:21:38 2018 +0200

    x86 Win MSP build fix
    
    Change-Id: I2580fe0eacd5834047b50f36384ad9ea6c9d0354

diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index f822afe7eaec..3dfba9e7a8de 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -287,8 +287,9 @@ sub create_directory_structure
     {
         if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; }
     }
-    # FIXME why is this hack needed? ERROR: Did not find full directory path for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
+    # FIXME why is this hack needed? ERROR: Did not find full directory path for dir: "SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
     $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"} = $targetdir . $installer::globals::separator . "System";
+    $fullpathhash{"SystemFolder_x86_VC.E281B893_10D7_34CE_BB0E_B69D88E154A5"} = $targetdir . $installer::globals::separator . "System";
     $fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} = $targetdir . $installer::globals::separator . "System64";
 
     return \%fullpathhash;


More information about the Libreoffice-commits mailing list