diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-10-23 01:19:13 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-23 01:24:36 -0700 |
| commit | af2a4d96b3886df2f3fe9af8af480897d128b2ed (patch) | |
| tree | 74da2b907a11f9ae450d655f221f1816d32caf65 /instsetoo_native | |
| parent | 5723a662bfc2fcf9e3c93803d07e2cbe252a7516 (diff) | |
Better solution to the MSP REINSTALL problem
This reverts commit 13bf74072e416b28fe733ac97cfdcd31f6bfe0f0.
Details: SparkeShare/productivity.git/Product/MSP-patching.txt
Change-Id: Ie1a7edc4cfdaf72beb24e487572e315ef669e49f
Diffstat (limited to 'instsetoo_native')
3 files changed, 1 insertions, 3 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index a7683a72519d..3b37421a28c5 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -85,7 +85,7 @@ OutOfSpace Resume NewDialog CustomSetup ACTION <> "ADMIN" 0 PatchWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 0 PatchWelcome Cancel SpawnDialog CancelSetup 1 1 PatchWelcome Next EndDialog Return 1 3 -PatchWelcome Next Reinstall ALL PATCH And REINSTALL="" 1 +PatchWelcome Next Reinstall ALL PATCH 1 PatchWelcome Next ReinstallMode omus PATCH And REINSTALLMODE="" 2 ReadyToInstall Back NewDialog FileTypeDialog Installed OR _IsSetupTypeMin = "Custom" 2 ReadyToInstall Back NewDialog MaintenanceType Installed AND _IsMaintenance = "Reinstall" 3 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index d4618cdaf71f..937270577002 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -14,4 +14,3 @@ ResetLanguageSelected 51 LANG_SELECTED 0 SetApplicationSelected 51 APP_SELECTED 1 ResetApplicationSelected 51 APP_SELECTED 0 SetAdminInstallProperty 51 ADMININSTALL 1 -PatchInstall 51 REINSTALL ALL diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 4ffdb306c66c..6dd5ede6d88c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -15,7 +15,6 @@ FileCost 400 FindRelatedProducts NOT ISSETUPDRIVEN 100 InstallFiles 1950 InstallFinalize 3150 -PatchInstall PATCH 699 InstallInitialize 700 InstallODBC 2600 InstallServices VersionNT 2750 |