[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 6fe48459fd5e38128b1c0f1d6fdd05dcd745c7bf

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  6fe48459fd5e38128b1c0f1d6fdd05dcd745c7bf (commit)
      from  c390c7c32d85ed30a1b533c44b720685f3ceb4f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6fe48459fd5e38128b1c0f1d6fdd05dcd745c7bf
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun May 6 10:40:00 2012 -0700

    don't abort upgrade if a RADIUS server is unreachable

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 910346b..57bbdb4 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -1154,8 +1154,13 @@ sub _upgrade_exporttype {
 
 sub import_attrs {
   my $self = shift;
-  my $dbh = sqlradius_connect( map $self->option($_),
+  my $dbh =  DBI->connect( map $self->option($_),
                                    qw( datasrc username password ) );
+  unless ( $dbh ) {
+    warn "Error connecting to RADIUS server: $DBI::errstr\n";
+    return;
+  }
+
   my $usergroup = $self->option('usergroup') || 'usergroup';
   my $error;
   warn "Importing RADIUS groups and attributes from ".$self->option('datasrc').

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/sqlradius.pm |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)