This commit was generated by cvs2svn to compensate for changes in r6255,

[freeside.git] / rt / sbin / rt-setup-database.in

diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index c8e63a9..98d965c 100644 (file)
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -160,6 +160,9 @@ elsif ( $args{'action'} eq 'drop' ) {
     }
     drop_db();
 }
+elsif ( $args{'action'} eq 'insert_initial' ) {
+    insert_initial_data();
+}
 elsif ( $args{'action'} eq 'insert' ) {
     insert_data( $args{'datafile'} || ($args{'datadir'}."/content") );
 }
@@ -583,7 +586,7 @@ sub insert_data {
             my ($return,$msg) = $new_entry->Create(%$item);
             unless ($return) {
                 print "(Error: $msg)\n";
-                next;
+                exit;
             }
             print $return. ".";
         }
@@ -599,7 +602,7 @@ sub insert_data {
             my ($return,$msg) = $new_entry->Create(%$item);
             unless ($return) {
                 print "(Error: $msg)\n";
-                next;
+                exit;
             }
             print $return. ".";
         }
@@ -677,7 +680,9 @@ $0: Set up RT's database
 --action        init    Initialize the database
                 drop    Drop the database.
                         This will ERASE ALL YOUR DATA
-                insert  Insert data into RT's database.
+                insert_initial 
+                        Insert RT's core system objects
+                insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
                         using the '--datafile' option below.