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

diff --git a/src/windows/installer/wix/property.wxi b/src/windows/installer/wix/property.wxi
index 1477acc07977eeae8d35c19d8799cf325ef5ed89..3e52f046d27b1d3a01c8d49eda87ea106ae31f77 100644 (file)
--- 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>