[Rt-commit] r5214 - in rt/branches/3.5-EXPERIMENTAL-MYSQL-UPDATES: .

[ruz at bestpractical.com]

Author: ruz
Date: Fri May 12 16:24:58 2006
New Revision: 5214

Modified:
   rt/branches/3.5-EXPERIMENTAL-MYSQL-UPDATES/   (props changed)
   rt/branches/3.5-EXPERIMENTAL-MYSQL-UPDATES/sbin/rt-setup-database.in

Log:
 r2877 at cubic-pc:  cubic | 2006-05-12 22:24:44 +0400
 * simplify if/elsif branch


Modified: rt/branches/3.5-EXPERIMENTAL-MYSQL-UPDATES/sbin/rt-setup-database.in
==============================================================================
--- rt/branches/3.5-EXPERIMENTAL-MYSQL-UPDATES/sbin/rt-setup-database.in	(original)
+++ rt/branches/3.5-EXPERIMENTAL-MYSQL-UPDATES/sbin/rt-setup-database.in	Fri May 12 16:24:58 2006
@@ -220,30 +220,11 @@
 sub insert_acl {
     my $base_path = (shift || $RT::EtcPath);
 
-    if ( $RT::DatabaseType =~ /^oracle$/i ) {
-        do $base_path . "/acl.Oracle"
-          || die "Couldn't find ACLS for Oracle\n" . $@;
-    }
-    elsif ( $RT::DatabaseType =~ /^pg$/i ) {
-        do $base_path . "/acl.Pg" || die "Couldn't find ACLS for Pg\n" . $@;
-    }
-    elsif ( $RT::DatabaseType =~ /^mysql$/i ) {
-        do $base_path . "/acl.mysql"
-          || die "Couldn't find ACLS for mysql in $base_path\n" . $@;
-    }
-    elsif ( $RT::DatabaseType =~ /^Sybase$/i ) {
-        do $base_path . "/acl.Sybase"
-          || die "Couldn't find ACLS for Sybase in $base_path\n" . $@;
-    }
-    elsif ( $RT::DatabaseType =~ /^informix$/i ) {
-        do $base_path . "/acl.Informix"
-          || die "Couldn't find ACLS for Informix in $base_path\n" . $@;
-    }
-    elsif ( $RT::DatabaseType =~ /^SQLite$/i ) {
+    if ( $RT::DatabaseType eq 'SQLite' ) {
         return;
-    }
-    else {
-        die "Unknown RT database type";
+    } else {
+        do $base_path ."/acl.". $RT::DatabaseType
+            || die "Couldn't find ACLs for ". $RT::DatabaseType .": " . $@;
     }
 
     my @acl = acl($dbh);