STABLE14-windows-msi-no-vista-20070115

Prevent the 1.4 release from being installed on Vista

diff --git a/src/WINNT/install/wix/lang/en_US/strings.wxl b/src/WINNT/install/wix/lang/en_US/strings.wxl
index dab8cee81d68d4ebe57ddedda2ca24a1812b53c1..84f81e27bb9907419cf8042298b898c4734be27e 100644 (file)
--- a/src/WINNT/install/wix/lang/en_US/strings.wxl
+++ b/src/WINNT/install/wix/lang/en_US/strings.wxl
@@ -35,6 +35,7 @@
     <String Id="StrCfgWzdDesc">Server Configuration Wizard</String>
 
     <String Id="StrLaunchCond">OpenAFS for Windows is currently only packaged for Windows 2000,XP and 2003</String>
+    <String Id="StrLaunchNoVista">This version of OpenAFS for Windows is not compatible with Microsoft Vista.  Please install OpenAFS for Windows version 1.5.14 or higher.</String>
     <String Id="AdminRequired">Installation of OpenAFS for Windows requires administrative privileges</String>
 
        <String Id="ErrNPIFailed">Installation of Network Provider failed.  System error [2]</String>

diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index 2c2737a05d284771cc89a9420aed71dcb0ae7abd..74d96dcf1bcdf0fbd6cfd279a30b9b91f93b4bc5 100644 (file)
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -47,6 +47,9 @@
         <Condition Message="$(loc.StrLaunchCond)">
          <![CDATA[VersionNT >= 500]]>
         </Condition>
+        <Condition Message="$(loc.StrLaunchNoVista)">
+         <![CDATA[VersionNT < 600]]>
+        </Condition>
         <Condition Message="$(loc.AdminRequired)">Privileged</Condition>