[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

Mike Kaganski mike.kaganski at collabora.com
Fri Apr 13 19:31:23 UTC 2018


 instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 378c1576d2890625ebbd18ec9ccff560eeb1619f
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Fri Apr 13 18:58:48 2018 +0100

    LaunchConditions may be specific to install modes
    
    Those conditions that rely on AppSearch should only be checked when
    not yet installed, since AppSearch is not performed in maintenance modes
    
    Change-Id: Ie2c3fa8e8742a4c335f0cd8be571fa563a178a49
    Reviewed-on: https://gerrit.libreoffice.org/52851
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index 2d72ac2d05c4..629c3c5582e1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,5 +2,5 @@ Condition	Description
 s255	l255
 65001	LaunchCondition	Condition
 Privileged	OOO_LAUNCH_1
-VersionNT > WindowsMinVersionNumber Or (VersionNT = WindowsMinVersionNumber And ServicePackLevel >= WindowsMinSPNumber)	OOO_LAUNCH_2
-VersionNT <> 603 Or WIN81S14	OOO_LAUNCH_3
+Installed Or VersionNT > WindowsMinVersionNumber Or (VersionNT = WindowsMinVersionNumber And ServicePackLevel >= WindowsMinSPNumber)	OOO_LAUNCH_2
+Installed Or VersionNT <> 603 Or WIN81S14	OOO_LAUNCH_3


More information about the Libreoffice-commits mailing list