krb5 commit [krb5-1.10]: Remove NSIS installs when upgrading to 64-bit
Tom Yu
tlyu at MIT.EDU
Tue Sep 25 14:04:00 EDT 2012
https://github.com/krb5/krb5/commit/6075a3f8ddb73be6f1f4fae44475842b4b667b16
commit 6075a3f8ddb73be6f1f4fae44475842b4b667b16
Author: Ben Kaduk <kaduk at mit.edu>
Date: Tue Sep 18 17:53:18 2012 -0400
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
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>
More information about the cvs-krb5
mailing list