]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
DEVEL15-windows-wix-nsis-uninstall-20071023
authorJeffrey Altman <jaltman@secure-endpoints.com>
Wed, 24 Oct 2007 04:50:35 +0000 (04:50 +0000)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Wed, 24 Oct 2007 04:50:35 +0000 (04:50 +0000)
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)

src/WINNT/install/wix/property.wxi

index 6861b61181fa6ee3c1f4cdb10fb4a77e682299cf..a32eb949cbde30f0467bcf95e4db1ee4c87b9207 100644 (file)
          <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">