diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-12-14 08:37:45 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-19 18:57:20 +0100 |
| commit | dd43ea20eedf3dfbc516065d9dc23c8dab8938a9 (patch) | |
| tree | 182e2460571036d994e4aebe67bc373b12941d40 /scp2 | |
| parent | c4f95e1231515bb5f25587181ce9ec0249d0f83e (diff) | |
MSI cleanup: remove redundant conditions
VersionNT is now always greated than 600 (only needs checking in version
checking action). ISSETUPDRIVEN and ISSCHEDULEREBOOT are specific to
InstallShield and aren't relevant to LibreOffice installer.
Change-Id: I6cb769c863e09f1568ae895a6cfbb0e5940c2486
Reviewed-on: https://gerrit.libreoffice.org/46434
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit cfbc934609aaa303d03fd73b58bde1370ea312dc)
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/windowscustomaction_ooo.scp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 39a0d52cbd54..bc7201b9b2b4 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -24,7 +24,7 @@ WindowsCustomAction gid_Customaction_RenamePrgFolder Source = "shlxtmsi.dll"; Target = "RenamePrgFolder"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID"); + Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID"); End WindowsCustomAction gid_Customaction_RemovePrgFolder @@ -33,7 +33,7 @@ WindowsCustomAction gid_Customaction_RemovePrgFolder Source = "shlxtmsi.dll"; Target = "RemovePrgFolder"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end"); + Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end"); End WindowsCustomAction gid_Customaction_Regallmsdocdll |