From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 15 Jan 2007 21:05:24 +0000 (+0000)
Subject: STABLE14-windows-msi-no-vista-20070115
X-Git-Tag: openafs-stable-1_4_3rc1~3
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8553187acd6aad71934dc9ac05225c63cae53045;p=packages%2Fo%2Fopenafs.git

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 dab8cee81..84f81e27b 100644
--- 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 2c2737a05..74d96dcf1 100644
--- 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>