change prereq checks for 4.6.0 release

diff --git a/scripts/xml/distribution_install.xml b/scripts/xml/distribution_install.xml
index 31988a8..e54412d 100644 (file)
--- a/scripts/xml/distribution_install.xml
+++ b/scripts/xml/distribution_install.xml
@@ -11,16 +11,16 @@
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking xTuple ERP database version" >
+                name = "Checking for too-old xTuple ERP database version" >
     <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
     <message>This package must be applied to a 4.4+ Distribution database.
     </message>
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking for bad xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.0' AND fetchMetricText('ServerVersion')!='4.6.0-beta' AND fetchMetricText('ServerVersion')!='4.6.0RC';</query>
-    <message>This package may not be applied to a 4.6.0+ PostBooks database.
+                name = "Checking for too-new xTuple ERP database version" >
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.1';</query>
+    <message>This package may not be applied to a database newer than 4.6.0.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
index 1e4de93..36cca32 100644 (file)
--- a/scripts/xml/distribution_package.xml
+++ b/scripts/xml/distribution_package.xml
@@ -11,16 +11,16 @@
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking xTuple ERP database version" >
+                name = "Checking for too-old xTuple ERP database version" >
     <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
     <message>This package must be applied to a 4.4+ Distribution database.
     </message>
   </prerequisite>
 
- <prerequisite type = "query"
-               name = "Checking for bad xTuple ERP database version" >
-<query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.0' AND fetchMetricText('ServerVersion')!='4.6.0-beta' AND fetchMetricText('ServerVersion')!='4.6.0RC';</query>
-    <message>This package may not be applied to a 4.6.0+ Distribution database.
+  <prerequisite type = "query"
+                name = "Checking for too-new xTuple ERP database version" >
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.1';</query>
+    <message>This package may not be applied to a database newer than 4.6.0.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/postbooks_package.xml b/scripts/xml/postbooks_package.xml
index ea4851c..fd4a154 100644 (file)
--- a/scripts/xml/postbooks_package.xml
+++ b/scripts/xml/postbooks_package.xml
@@ -11,16 +11,16 @@
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking xTuple ERP database version" >
+                name = "Checking for too-old xTuple ERP database version" >
     <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
-    <message>This package must be applied to a 4.4+ PostBooks database.
+    <message>This package must be applied to a 4.4+ database.
     </message>
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking for bad xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.0' AND fetchMetricText('ServerVersion')!='4.6.0-beta' AND fetchMetricText('ServerVersion')!='4.6.0RC';</query>
-    <message>This package may not be applied to a 4.6.0+ Postbooks database.
+                name = "Checking for too-new xTuple ERP database version" >
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.1';</query>
+    <message>This package may not be applied to a database newer than 4.6.0.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/xtmfg_install.xml b/scripts/xml/xtmfg_install.xml
index f69669a..1643c2c 100644 (file)
--- a/scripts/xml/xtmfg_install.xml
+++ b/scripts/xml/xtmfg_install.xml
@@ -11,16 +11,16 @@
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking xTuple ERP database version" >
+                name = "Checking for too-old xTuple ERP database version" >
     <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
-    <message>This package must be applied to a 4.4+ Distribution database.
+    <message>This package must be applied to a 4.4+ database.
     </message>
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking for bad xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.0' AND fetchMetricText('ServerVersion')!='4.6.0-beta' AND fetchMetricText('ServerVersion')!='4.6.0RC';</query>
-    <message>This package may not be applied to a 4.6.0+ Distribution database.
+                name = "Checking for too-new xTuple ERP database version" >
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.1';</query>
+    <message>This package may not be applied to a database newer than 4.6.0.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
index 1685e3f..9f4ec08 100644 (file)
--- a/scripts/xml/xtmfg_package.xml
+++ b/scripts/xml/xtmfg_package.xml
@@ -22,16 +22,16 @@
   </prerequisite>
 
   <prerequisite type = "query"
-                name = "Checking xTuple ERP database version" >
+                name = "Checking for too-old xTuple ERP database version" >
     <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
-    <message>This package must be applied to a 4.4+ Manufacturing database.
+    <message>This package must be applied to a 4.4+ database.
     </message>
   </prerequisite>
 
 <prerequisite type = "query"
-               name = "Checking for bad xTuple ERP database version" >
-<query>SELECT NOT fetchMetricText('ServerVersion') > '4.6.0-beta9' AND fetchMetricText('ServerVersion') != '4.6.0';</query>
-    <message>This package may not be applied to a 4.6.0+ Manufacturing database.
+               name = "Checking for too-new xTuple ERP database version" >
+<query>SELECT NOT fetchMetricText('ServerVersion') >= '4.6.1';</query>
+    <message>This package may not be applied to a database newer than 4.6.0.
     </message>
 </prerequisite>