[Fusionforge-commits] FusionForge branch Branch_5_3 updated. f10af5b0ba72650bff749d1e9a9229a1ff651f4f

Sylvain Beucler beuc-inria at fusionforge.org
Tue Mar 18 22:25:33 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  f10af5b0ba72650bff749d1e9a9229a1ff651f4f (commit)
       via  9b3b738891b5a01e3e9b2dbce70a32cc4959314e (commit)
      from  d81e9349b8a91f2baccc3d3d8a578a29cdb9d23a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f10af5b0ba72650bff749d1e9a9229a1ff651f4f
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Tue Mar 18 22:24:59 2014 +0100

    forge_get_config now doesn't fail due to DB during bootstrapping or maintenance (DB stopped, php5-pgsql not installed yet, etc.)

diff --git a/src/common/include/pre.php b/src/common/include/pre.php
index bf13c57..edc4afa 100644
--- a/src/common/include/pre.php
+++ b/src/common/include/pre.php
@@ -229,7 +229,7 @@ if (forge_get_config('database_name') != "") {
 	// Authentication-specific plugins subsystem
 	require_once $gfcommon.'include/AuthPlugin.class.php' ;
 
-	if (getenv ('FUSIONFORGE_NO_PLUGINS') != 'true') {
+	if (getenv ('FUSIONFORGE_NO_PLUGINS') != 'true' and getenv('FUSIONFORGE_NO_DB')) {
 		setup_plugin_manager () ;
 	}
 
diff --git a/src/utils/forge_get_config b/src/utils/forge_get_config
index e93ef92..609e5cc 100755
--- a/src/utils/forge_get_config
+++ b/src/utils/forge_get_config
@@ -20,7 +20,10 @@
  * with FusionForge; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-        
+
+// Don't try to connect to the DB, just reading config files
+putenv('FUSIONFORGE_NO_DB=true');
+
 require (dirname(__FILE__).'/../common/include/env.inc.php');
 require_once $gfcommon.'include/pre.php';
 
@@ -76,5 +79,3 @@ Or:           .../forge-get-config list-all-variables, for all variables
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

commit 9b3b738891b5a01e3e9b2dbce70a32cc4959314e
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Tue Mar 18 22:08:04 2014 +0100

    Mention unscd as an alternative to nscd

diff --git a/src/packaging/control/090shell-postgresql b/src/packaging/control/090shell-postgresql
index b91d9a4..891abd1 100644
--- a/src/packaging/control/090shell-postgresql
+++ b/src/packaging/control/090shell-postgresql
@@ -3,5 +3,5 @@ Architecture: all
 Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db-remote, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, openssh-server, libnss-pgsql2, ${misc:Depends}
 Provides: @OLDPACKAGE at -shell
 Conflicts: @OLDPACKAGE at -shell
-Recommends: nscd
+Recommends: unscd | nscd
 Description: collaborative development tool - shell accounts (using PostgreSQL)

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/pre.php                |    2 +-
 src/packaging/control/090shell-postgresql |    2 +-
 src/utils/forge_get_config                |    7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list