[Fusionforge-commits] r14851 - in trunk: . src/deb-specific

Roland Mas lolando at fusionforge.org
Thu Nov 17 20:54:06 CET 2011


Author: lolando
Date: 2011-11-17 20:54:05 +0100 (Thu, 17 Nov 2011)
New Revision: 14851

Modified:
   trunk/
   trunk/src/deb-specific/old-db-upgrade.pl
Log:
Don't run the old upgrader at all if the new scheme is already in place

Modified: trunk/src/deb-specific/old-db-upgrade.pl
===================================================================
--- trunk/src/deb-specific/old-db-upgrade.pl	2011-11-17 19:53:58 UTC (rev 14850)
+++ trunk/src/deb-specific/old-db-upgrade.pl	2011-11-17 19:54:05 UTC (rev 14851)
@@ -38,10 +38,12 @@
 $dbh->{RaiseError} = 1;
 eval {
     my ($sth, @array, $version, $path, $target) ;
-
-    # Do we have at least the basic schema?
-    # Create Sourceforge database
-    if (! &table_exists ($dbh, 'groups')) {	# No 'groups' table
+    # Is this script still relevant?
+    if (&table_exists ($dbh, 'database_startpoint')) {	
+	&debug ("Database maintenance already moved to unified script,") ;
+	&debug ("nothing to do in old upgrader.") ;
+    }
+    elsif (! &table_exists ($dbh, 'groups')) {	# No 'groups' table
 	# Installing SF 2.6 from scratch
 	&debug ("Creating initial Sourceforge database from files.") ;
 




More information about the Fusionforge-commits mailing list