report errors connecting to sqlradius dbs on upgrade

[freeside.git] / FS / FS / Upgrade.pm

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index befc36f..37167a8 100644 (file)
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -122,6 +122,12 @@ sub upgrade_sqlradius {
       { PrintError => 0, PrintWarn => 0 }
     );
 
+    unless $dbh {
+      warn "can't connect to RADIUS database ".
+           $part_export->option('datasrc').  ": $DBI::errstr\n";
+      next;
+    }
+
     my $errmsg = 'Error adding FreesideStatus to '.
                  $part_export->option('datasrc'). ': ';
   
@@ -154,7 +160,7 @@ sub upgrade_sqlradius {
     if ( $sth_index ) {
       unless ( $sth_index->execute ) {
         my $error = $sth_index->errstr;
-        warn $errmsg.$error; #unless $error =~ /exists/i;
+        warn $errmsg.$error unless $error =~ /Duplicate key name/i;
       }
     } else {
       my $error = $dbh->errstr;