[Rt-commit] r12312 - in rt/branches/3.8-TESTING: .

[ruz at bestpractical.com]

Author: ruz
Date: Wed May 14 12:13:41 2008
New Revision: 12312

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/sbin/rt-setup-database.in

Log:
 r12348 at cubic-pc:  cubic | 2008-05-14 16:12:57 +0400
 * prepare for upgrade action


Modified: rt/branches/3.8-TESTING/sbin/rt-setup-database.in
==============================================================================
--- rt/branches/3.8-TESTING/sbin/rt-setup-database.in	(original)
+++ rt/branches/3.8-TESTING/sbin/rt-setup-database.in	Wed May 14 12:13:41 2008
@@ -102,12 +102,12 @@
     exit(-1);
 }
 foreach ( @actions ) {
-    unless ( /^(?:init|create|drop|schema|acl|coredata|insert)$/ ) {
+    unless ( /^(?:init|create|drop|schema|acl|coredata|insert|upgrade)$/ ) {
         print STDERR "$0 called with an invalid --action parameter.\n";
         exit(-1);
     }
-    if ( ($_ eq 'init' || $_ eq 'drop') && @actions > 1 ) {
-        print STDERR "You can not mix init or drop action with any action.\n";
+    if ( /^(?:init|drop|upgrade)$/ && @actions > 1 ) {
+        print STDERR "You can not mix init, drop or upgrade action with any action.\n";
         exit(-1);
     }
 }