From: Jeffrey Altman Date: Fri, 4 May 2007 00:13:31 +0000 (+0000) Subject: DEVEL15-windows-wix-beta-upgrades-20070503 X-Git-Tag: openafs-devel-1_5_20~29 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=deabf0f531cbbc09e73c230c4e01811edc04aec9;p=packages%2Fo%2Fopenafs.git DEVEL15-windows-wix-beta-upgrades-20070503 This change is not as important for OpenAFS as it was for KFW as OpenAFS does not issue betas with the same build numbers as final releases. However, for users of daily builds when build numbers are not being incremented it will provide benefit. We modify the upgrade rules to include the current version number and then block the uninstall if the currently installed package is the one that is being installed. The change applies to both the regular installer and the 32-bit tools for WOW64 environments. (cherry picked from commit 9f508ce443f1ef2103fbb74c6a094aef3aa96e86) --- diff --git a/src/WINNT/install/wix/oafwbins.wxs b/src/WINNT/install/wix/oafwbins.wxs index 0fef27e8a..f04b1d087 100644 --- a/src/WINNT/install/wix/oafwbins.wxs +++ b/src/WINNT/install/wix/oafwbins.wxs @@ -69,13 +69,13 @@ - OPENAFSBIN_UPGRADE + (Not Installed) And (OPENAFSBIN_UPGRADE) - + - + diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs index 3fde40ae8..a1f72348e 100644 --- a/src/WINNT/install/wix/openafs.wxs +++ b/src/WINNT/install/wix/openafs.wxs @@ -207,7 +207,7 @@ - IBMAFS_UPGRADE OR OPENAFS_UPGRADE OR AFSPLUGIN_UPGRADE + (Not Installed) And (IBMAFS_UPGRADE OR OPENAFS_UPGRADE OR AFSPLUGIN_UPGRADE) NSISUNINSTALL <> "" AND UILevel >= 4 NSISUNINSTALL <> "" AND UILevel < 4 @@ -233,9 +233,9 @@ - + - +