From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 24 Oct 2007 04:50:35 +0000 (+0000)
Subject: DEVEL15-windows-wix-nsis-uninstall-20071023
X-Git-Tag: openafs-devel-1_5_27~48
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ed333bd0c6200441d7421c5c40b251bef4841d03;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-wix-nsis-uninstall-20071023


At somepoint windows installer broke the use of the 'file' RegistrySearch
type.  Instead of returning the full file name path we are only getting
the directory.  Switch to using the 'raw' type since we know we aren't
prefixing the file name with a hash.


(cherry picked from commit 57b28bb8eed956e1fe27cef81efd4cb30e63837d)
---

diff --git a/src/WINNT/install/wix/property.wxi b/src/WINNT/install/wix/property.wxi
index 6861b6118..a32eb949c 100644
--- a/src/WINNT/install/wix/property.wxi
+++ b/src/WINNT/install/wix/property.wxi
@@ -117,7 +117,7 @@
 	  <RegistrySearch Win64="$(var.Win64)" Id="rl_NSIS_Ver" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenAFS" Name="DisplayVersion" Type="raw" />
 	</Property>
     <Property Id="NSISUNINSTALL">
-	  <RegistrySearch Win64="$(var.Win64)" Id="rl_NSIS_Uninst" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenAFS" Name="UninstallString" Type="file" />
+	  <RegistrySearch Win64="$(var.Win64)" Id="rl_NSIS_Uninst" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenAFS" Name="UninstallString" Type="raw" />
     </Property>
     
     <Property Id="OLDCELLSERVDB">