diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2012-09-18 17:53:18 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2012-09-25 13:43:54 -0400 |
| commit | 6075a3f8ddb73be6f1f4fae44475842b4b667b16 (patch) | |
| tree | d47e01da432c803b0b205863ca2c0b15fb314709 | |
| parent | b3b569e4222b1fc7217034600ae7e8778b6cfa1c (diff) | |
| download | krb5-6075a3f8ddb73be6f1f4fae44475842b4b667b16.zip krb5-6075a3f8ddb73be6f1f4fae44475842b4b667b16.tar.gz krb5-6075a3f8ddb73be6f1f4fae44475842b4b667b16.tar.bz2 | |
Remove NSIS installs when upgrading to 64-bit
The NSIS installer appears to have only ever existed as a 32-bit
software. As such, unconditionally check the 32-bit registry tree
for an uninstall string; the architecture of the current package
being installed is not relevant to what was previously installed.
(cherry picked from commit 4d3200ca369b47e8cf6966ae7670823d57ef2b3f)
ticket: 7362
status: resolved
| -rw-r--r-- | src/windows/installer/wix/property.wxi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/windows/installer/wix/property.wxi b/src/windows/installer/wix/property.wxi index 1477acc..3e52f04 100644 --- a/src/windows/installer/wix/property.wxi +++ b/src/windows/installer/wix/property.wxi @@ -41,11 +41,11 @@ <Property Id="ComponentDownload">http://web.mit.edu/kerberos</Property> <Property Id="UPGRADENSIS"> - <RegistrySearch Win64="$(var.Win64)" Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="raw"/> + <RegistrySearch Win64="no" Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="raw"/> </Property> <Property Id="NSISVERSION"> - <RegistrySearch Win64="$(var.Win64)" Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="raw" /> + <RegistrySearch Win64="no" 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> |