[freeside-commits] freeside/FS/bin freeside-upgrade,1.27,1.28

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv29417

Modified Files:
	freeside-upgrade 
Log Message:
prevent death on meritless sqlradius upgrade attempts

Index: freeside-upgrade
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-upgrade,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- freeside-upgrade	11 Apr 2009 20:51:32 -0000	1.27
+++ freeside-upgrade	18 May 2009 18:21:38 -0000	1.28
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw($opt_d $opt_s $opt_q $opt_v);
+use vars qw($opt_d $opt_s $opt_q $opt_v $opt_r);
 use vars qw($DEBUG $DRY_RUN);
 use Getopt::Std;
 use DBIx::DBSchema 0.31;
@@ -17,7 +17,7 @@
 
 die "Not running uid freeside!" unless checkeuid();
 
-getopts("dqs");
+getopts("dqrs");
 
 $DEBUG = !$opt_q;
 #$DEBUG = $opt_v;
@@ -153,7 +153,7 @@
 $start = time;
 
 upgrade_sqlradius()
-  unless $DRY_RUN || $opt_s;
+  unless $DRY_RUN || $opt_s || $opt_r;
 
 warn "SQL RADIUS updates completed in ". (time-$start). " seconds\n"; # if $DEBUG;
 $start = time;
@@ -172,7 +172,7 @@
 }
 
 sub usage {
-  die "Usage:\n  freeside-upgrade [ -d ] [ -s ] [ -q | -v ] user\n"; 
+  die "Usage:\n  freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ] user\n"; 
 }
 
 =head1 NAME
@@ -181,7 +181,7 @@
 
 =head1 SYNOPSIS
 
-  freeside-upgrade [ -d ] [ -s ] [ -q | -v ]
+  freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ]
 
 =head1 DESCRIPTION
 
@@ -203,6 +203,9 @@
 
   [ -q ]: Run quietly.  This may become the default at some point.
 
+  [ -r ]: Skip sqlradius updates.  Useful for occassions where the sqlradius
+          databases may be inaccessible.
+
   [ -v ]: Run verbosely, sending debugging information to STDERR.  This is the
           current default.