From: Greg Pazo <gpazo@xtuple.com>
Date: Mon, 6 Oct 2014 18:11:29 +0000 (-0400)
Subject: modify the pre-req check a bit, only check for major versions
X-Git-Url: http://git.roojs.org/?p=xtuple;a=commitdiff_plain;h=13a11ab4e35f1c27d500272b379b484157a984cf

modify the pre-req check a bit, only check for major versions
---

diff --git a/scripts/xml/distribution_install.xml b/scripts/xml/distribution_install.xml
index 6ef796353..0d32d935f 100644
--- a/scripts/xml/distribution_install.xml
+++ b/scripts/xml/distribution_install.xml
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta2.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0.
     </message>
   </prerequisite>
 
diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
index 48ca1d156..0518ab715 100644
--- a/scripts/xml/distribution_package.xml
+++ b/scripts/xml/distribution_package.xml
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta2.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0.
     </message>
   </prerequisite>
 
diff --git a/scripts/xml/ent_install.xml b/scripts/xml/ent_install.xml
index 3007deaf9..fbc02c171 100644
--- a/scripts/xml/ent_install.xml
+++ b/scripts/xml/ent_install.xml
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta2.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0.
     </message>
   </prerequisite>
 
diff --git a/scripts/xml/ent_package.xml b/scripts/xml/ent_package.xml
index 371811ddf..bda4c8c85 100644
--- a/scripts/xml/ent_package.xml
+++ b/scripts/xml/ent_package.xml
@@ -30,8 +30,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta2.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0.
     </message>
   </prerequisite>
 
diff --git a/scripts/xml/postbooks_package.xml b/scripts/xml/postbooks_package.xml
index 53934634a..5c978d506 100644
--- a/scripts/xml/postbooks_package.xml
+++ b/scripts/xml/postbooks_package.xml
@@ -19,7 +19,7 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0';</query>
     <message>This package may not be applied to a database newer than 4.7.0Beta2.
     </message>
   </prerequisite>
diff --git a/scripts/xml/xtmfg_install.xml b/scripts/xml/xtmfg_install.xml
index bdf202461..3d34014cb 100644
--- a/scripts/xml/xtmfg_install.xml
+++ b/scripts/xml/xtmfg_install.xml
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta2.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0.
     </message>
   </prerequisite>
 
diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
index c02dd0a09..5efeae1fe 100644
--- a/scripts/xml/xtmfg_package.xml
+++ b/scripts/xml/xtmfg_package.xml
@@ -30,8 +30,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta2.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0.
     </message>
   </prerequisite>