[Fusionforge-commits] FusionForge branch master updated. 8851e7ac89a133d7c64093411e172b5559793311

Sylvain Beucler beuc-inria at fusionforge.org
Tue Sep 9 15:57:02 CEST 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, master has been updated
       via  8851e7ac89a133d7c64093411e172b5559793311 (commit)
       via  19084d6982a0b5e15d09034a99cd26947f088776 (commit)
      from  2220589f24c849b6dab1245fc5d130b959287f57 (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 8851e7ac89a133d7c64093411e172b5559793311
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 9 15:44:59 2014 +0200

    post-install: ini: fallback to 'hostname' if 'hostname -f' returns an error

diff --git a/src/post-install.d/common/ini.sh b/src/post-install.d/common/ini.sh
index fb41af8..a6dea8b 100755
--- a/src/post-install.d/common/ini.sh
+++ b/src/post-install.d/common/ini.sh
@@ -23,9 +23,10 @@ source_path=$(forge_get_config source_path)
 config_path=$(forge_get_config config_path)
 
 # TODO: support 'db_get @PACKAGE@/shared/web_host' ?
+hostname=$(hostname -f || hostname)
 if [ ! -e $config_path/config.ini.d/post-install.ini ]; then \
 	sed $source_path/templates/post-install.ini \
-		-e "s, at web_host@,$(hostname -f)," \
+		-e "s, at web_host@,$hostname," \
 		> $config_path/config.ini.d/post-install.ini; \
 fi
 

commit 19084d6982a0b5e15d09034a99cd26947f088776
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 9 15:40:04 2014 +0200

    post-install: db: avoid verbose 'Entering upgrade-db.php', particularly noisy in rpm installs

diff --git a/src/post-install.d/db/upgrade.php b/src/post-install.d/db/upgrade.php
index 6a610d3..75fcb63 100755
--- a/src/post-install.d/db/upgrade.php
+++ b/src/post-install.d/db/upgrade.php
@@ -34,8 +34,6 @@ require_once dirname(__FILE__).'/../../common/include/env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require_once $gfcommon.'include/sqlparser.php';
 
-echo "Entering  upgrade-db.php\n";
-
 $db_path = forge_get_config('source_path').'/db/';
 $date = -1;
 $version = '';

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

Summary of changes:
 src/post-install.d/common/ini.sh  |    3 ++-
 src/post-install.d/db/upgrade.php |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list