From d5e75b93cd75eb00d1f6cb11cf81b399c7fb9aa4 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 19 Jun 2007 19:22:24 +0000 Subject: [PATCH] pull up r19541 from trunk r19541@cathode-dark-space: jaltman | 2007-05-03 18:57:05 -0400 ticket: new subject: Modify WIX installer to better support upgrading betas component: windows tags: pullup The WIX installers did not upgrade previous installations with the same version number as the current package being installed. This would leave multiple installations of KFW x.y.z registered as being installed on the machine even though only the most recent install is being used. This commit instructs the Windows Installer to uninstall previous installations with the same version number (the Maximum Upgrade version) as the package that is being installed while ensuring that the package being installed will not be uninstalled if the installation is being modified or repaired. ticket: 5554 version_fixed: 1.6.2 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19591 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/installer/wix/kfw.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs index f6262459d..6d0883c5f 100644 --- a/src/windows/installer/wix/kfw.wxs +++ b/src/windows/installer/wix/kfw.wxs @@ -148,7 +148,7 @@ - UPGRADEPISMERE Or UPGRADEKFW + (Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW) UILevel = 0 And (Not Installed) And (CCP_Success <> 1) UPGRADENSIS <> "" And UILevel >= 4 @@ -171,7 +171,7 @@ - + -- 2.26.2