diff options
author | Andras Timar <atimar@suse.com> | 2012-05-14 22:08:38 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-05-14 23:08:45 +0200 |
commit | 80a921e88a036d42b4b884bb3e0b651fc083c1cd (patch) | |
tree | ef5e94acc2d70acb2bd5c8e61199e38b5a7d7e4c /scp2 | |
parent | 2c4fbc8785aff024e22f657c735d5cdafe5b9a70 (diff) |
fdo#46519 workaround of MSI installer error 1935
In some circumstances installation of embedded VC++ runtime
fails with error code 1935. This usually occurs, when there are
many different versions of VC++ runtimes installed on the computer,
including beta versions. We can workaround this Microsoft bug, if we
don't install our VC++ runtime. A new property was introduced. It is
called VC_REDIST, and installation of VC++ runtime depends on its
value. (BTW the solution is general, ComponentCondition can be used
for any merge module, now we have only the VC++ runtime merge module.)
When the user experiences error code 1935, he should try to install
LibreOffice with the following command line:
msiexec /i <msi file name> VC_REDIST=0
The patch fixes another minor issue. 64-bit VC++ runtime will
not be installed on 32-bit systems any more.
Change-Id: I I6c5e066c6e60b011235e6019a8a35c9e953209bc
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/vc_redist.scp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index a01f891b72b7..5ec433cf2b3d 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -33,12 +33,14 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86.msm"; RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; End MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; End #if defined(BUILD_X64) @@ -47,12 +49,14 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86_x64.msm"; RootDir = "TARGETDIR"; + ComponentCondition = "(VC_REDIST=1) AND VersionNT64"; End MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 Feature = gm_Root; Name = "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"; RootDir = "TARGETDIR"; + ComponentCondition = "(VC_REDIST=1) AND VersionNT64"; End #endif |