merge in rt 3.4.6. *gulp*!

2 files changed, 5 insertions, 1 deletions

diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 06c04dcf1..741c695cf 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -563,6 +563,10 @@ sub insert_data {
                 next;
             }
             my ( $return, $msg ) = $new_entry->Create(%$item);
+            unless( $return ) {
+                print "(Error: $msg)\n";
+                next;
+            }
 
             foreach my $value ( @{$values} ) {
                 my ( $eval, $emsg ) = $new_entry->AddValue(%$value);
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
index ce1f44150..d867fc2e4 100644
--- a/rt/sbin/rt-test-dependencies.in
+++ b/rt/sbin/rt-test-dependencies.in
@@ -255,7 +255,7 @@ DBD::Pg 1.41
 .
 
 $deps{'SQLITE'} = [ _( << '.') ];
-DBD::SQLite
+DBD::SQLite 1.00
 .
 
 if ($args{'download'}) {