diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2012-09-18 17:53:18 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-09-18 17:53:18 -0400 |
| commit | 4d3200ca369b47e8cf6966ae7670823d57ef2b3f (patch) | |
| tree | afd3ad9dc1009f0734d37f8aa5ab8026661b2377 /src/windows/installer | |
| parent | f220948484d08147b5572af89c69251e33bde6d7 (diff) | |
| download | krb5-4d3200ca369b47e8cf6966ae7670823d57ef2b3f.tar.gz krb5-4d3200ca369b47e8cf6966ae7670823d57ef2b3f.tar.xz krb5-4d3200ca369b47e8cf6966ae7670823d57ef2b3f.zip | |
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.
ticket: 7362 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows/installer')
| -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 1477acc079..3e52f046d2 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> |