[evolvis-commits] r18340: [#2969] revert part of bzr r10443

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Apr 12 12:46:58 CEST 2012


Author: mirabilos
Date: 2012-04-12 12:46:58 +0200 (Thu, 12 Apr 2012)
New Revision: 18340

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/fix-mailing-lists.pl
Log:
[#2969] revert part of bzr r10443

… this _should_ fix mailing lists and DB upgrades, until the real
problem can be fixed; other scripts may or may not be affected,
but this commit keeps the reversal minimal

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-04-12 09:13:20 UTC (rev 18339)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-04-12 10:46:58 UTC (rev 18340)
@@ -17,6 +17,7 @@
 sub debug ( $ ) ;
 
 require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions 
+require ("/etc/gforge/local.pl") ;
 
 &db_connect ;
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl	2012-04-12 09:13:20 UTC (rev 18339)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl	2012-04-12 10:46:58 UTC (rev 18340)
@@ -24,6 +24,7 @@
     $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
     $libdir $sqldir/ ;
 
+require ("/etc/gforge/local.pl") ; 
 $libdir="/usr/share/gforge/lib";
 $sqldir="/usr/share/gforge/db";
 require ("$libdir/sqlparser.pm") ; # Our magic SQL parser
@@ -116,6 +117,8 @@
 	  if (&is_lesser ($version, $target)) {
 	      &debug ("Adding local data.") ;
 
+	      do "/etc/gforge/local.pl" or die "Cannot read /etc/gforge/local.pl" ;
+
 	      my ($login, $md5pwd, $unixpwd, $email, $noreplymail, $date) ;
 
 	      $login = 'admin' ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/fix-mailing-lists.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/fix-mailing-lists.pl	2012-04-12 09:13:20 UTC (rev 18339)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/fix-mailing-lists.pl	2012-04-12 10:46:58 UTC (rev 18340)
@@ -14,6 +14,7 @@
 
 sub debug ( $ ) ;
 
+require ("/etc/gforge/local.pl") ;
 require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 &db_connect ;



More information about the evolvis-commits mailing list