diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-12-12 03:45:42 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-12-12 03:45:42 +0000 |
| commit | c4789f15f865c87fccccf1232e3221af5deddfe0 (patch) | |
| tree | db5d4721603d2002ac91187664680db51a49ce64 /src/windows | |
| parent | d88c3d1d2e49dfe5e09f2e1cb219f72c269d47ca (diff) | |
| download | krb5-c4789f15f865c87fccccf1232e3221af5deddfe0.tar.gz krb5-c4789f15f865c87fccccf1232e3221af5deddfe0.tar.xz krb5-c4789f15f865c87fccccf1232e3221af5deddfe0.zip | |
KFW BUG: WIX: 64-bit installer attempts to uninstall 32-bit NSIS
The 64-bit MSI must examine Win64 registry keys and not the 32-bit registry
keys which is where the 32-bit NSIS installation will be detected.
ticket: new
component: windows
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20174 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows')
| -rw-r--r-- | src/windows/installer/wix/property.wxi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/windows/installer/wix/property.wxi b/src/windows/installer/wix/property.wxi index b1f5c599bd..1477acc079 100644 --- a/src/windows/installer/wix/property.wxi +++ b/src/windows/installer/wix/property.wxi @@ -2,6 +2,7 @@ <!-- Copyright (C) 2004, 2005, 2006 by the Massachusetts Institute of Technology. + Copyright (C) 2007 Secure Endpoints Inc. All rights reserved. Export of this software from the United States of America may @@ -40,11 +41,11 @@ <Property Id="ComponentDownload">http://web.mit.edu/kerberos</Property> <Property Id="UPGRADENSIS"> - <RegistrySearch Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="raw"/> + <RegistrySearch Win64="$(var.Win64)" Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="raw"/> </Property> <Property Id="NSISVERSION"> - <RegistrySearch Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="raw" /> + <RegistrySearch Win64="$(var.Win64)" Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="raw" /> </Property> <Property Id="CantRemoveNSISError">$(loc.CantRemoveNSIS)</Property> |