[freeside-commits] freeside/FS/FS Upgrade.pm,1.41,1.42

[Ivan,,,]

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

Modified Files:
	Upgrade.pm 
Log Message:
fix unnecessary warnings on upgrade of remote Pg RADIUS db, RT#9178

Index: Upgrade.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Upgrade.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -d -r1.41 -r1.42
--- Upgrade.pm	28 Jul 2010 02:51:51 -0000	1.41
+++ Upgrade.pm	28 Jul 2010 02:54:45 -0000	1.42
@@ -200,7 +200,10 @@
         $sth_update->execute or die $errmsg.$sth_update->errstr;
       } else {
         my $error = $sth_alter->errstr;
-        warn $errmsg.$error unless $error =~ /Duplicate column name/i;
+        warn $errmsg.$error
+          unless $error =~ /Duplicate column name/i  #mysql
+              || $error =~ /already exists/i;        #Pg
+;
       }
     } else {
       my $error = $dbh->errstr;
@@ -215,7 +218,7 @@
         my $error = $sth_index->errstr;
         warn $errmsg.$error
           unless $error =~ /Duplicate key name/i                        #mysql
-              || $error =~ /relation "freesidestatus" already exists/i; #Pg
+              || $error =~ /already exists/i;    #Pg
       }
     } else {
       my $error = $dbh->errstr;