[evolvis-commits] r18342: [#2969] revert bzr r10510 (the partial revert), it only creates new trouble and doesn’t fix the issue at hand

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Apr 12 12:56:28 CEST 2012


Author: mirabilos
Date: 2012-04-12 12:56:28 +0200 (Thu, 12 Apr 2012)
New Revision: 18342

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
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
Log:
[#2969] revert bzr r10510 (the partial revert), it only creates new trouble and doesn’t fix the issue at hand

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 10:47:04 UTC (rev 18341)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-04-12 10:56:28 UTC (rev 18342)
@@ -17,7 +17,6 @@
 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 10:47:04 UTC (rev 18341)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl	2012-04-12 10:56:28 UTC (rev 18342)
@@ -24,7 +24,6 @@
     $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
@@ -117,8 +116,6 @@
 	  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 10:47:04 UTC (rev 18341)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/fix-mailing-lists.pl	2012-04-12 10:56:28 UTC (rev 18342)
@@ -14,7 +14,6 @@
 
 sub debug ( $ ) ;
 
-require ("/etc/gforge/local.pl") ;
 require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 &db_connect ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-12 10:47:04 UTC (rev 18341)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-12 10:56:28 UTC (rev 18342)
@@ -12,7 +12,6 @@
   * SECURITY (FEFE-b17a03df): Fix comparisons (use a non-coërcing
     operator) and ternary operator (PHP botches its evaluation order)
   * Ugh. “while (!$i = 16) {”. Need I say more?
-  * [#2969] revert part of the commit possibly introducing these problems
 
  -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 12 Apr 2012 12:43:24 +0200
 



More information about the evolvis-commits mailing list