diff options
| author | Andras Timar <atimar@suse.com> | 2013-04-29 22:08:13 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-04-18 02:31:11 -0700 |
| commit | 9421f377b3e4c0e9785781aedf0734e7e09e8337 (patch) | |
| tree | bc6b3eb1d1a3827e1ac9a4fe843bbd2059e0ff14 /instsetoo_native | |
| parent | 7c3130488707e19ccb6e8f3efe7a7c5516c660d0 (diff) | |
property REINSTALL should be set only when we apply a PATCH
with 11dd1094cb5452a8b61ad6bd284ba9517d3d869a I introduced
REINSTALL=ALL in the Property table, because without this MSP
patches did not work as expected -- some files were not patched.
I found "The file represented by File table key 'foo.bar' has
no eligible binary patches" lines in the log, and I did not find
a better solution. I'll revisit the problem later, maybe file versioning
can be changed. Windows Installer usually ignores the fourth digit in
version numbers, and we bump the the fourth digit only (i.e. 3.6.10.304 ->
3.6.10.520).
However, when upgrading a patched 3.6 to 4.0, REINSTALL=ALL strikes back.
Windows Installer passes REMOVE=ALL argument to 3.6 package, but REINSTALL=ALL
takes precedence, so 3.6 will not be removed, but reinstalled! 3.6 and 4.0
both will be installed, there will be an entry for each in Add/Remove Programs
Control Panel applet.
So I made REINSTALL=ALL conditional, and as a side effect, normal MSI
packages built from PTF branches will be fully useable again. If REINSTALL
is set for a product that is yet to be installed, no installation action
will take place at all. It really makes sense to selectively enable it
only for patches. I'm sorry that I did not figure this out earlier.
Conflicts:
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
Change-Id: Ic05dc66579c60f1eb599baf6be4289b22301cebe
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 1 | ||||
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 937270577002..d4618cdaf71f 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -14,3 +14,4 @@ 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 6dd5ede6d88c..4ffdb306c66c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -15,6 +15,7 @@ FileCost 400 FindRelatedProducts NOT ISSETUPDRIVEN 100 InstallFiles 1950 InstallFinalize 3150 +PatchInstall PATCH 699 InstallInitialize 700 InstallODBC 2600 InstallServices VersionNT 2750 |