[Fusionforge-commits] FusionForge branch master updated. 23bf453bf81df2adb6136a3b209b5b637ab5eed1

Franck VILLAUME nerville at fusionforge.org
Thu Feb 13 18:14:43 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, master has been updated
       via  23bf453bf81df2adb6136a3b209b5b637ab5eed1 (commit)
       via  f04254df7864f599888a0e7b57af4026b22fc56d (commit)
      from  770c6d17040ec68b2931f5c6fd6690c3cd411bfe (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 23bf453bf81df2adb6136a3b209b5b637ab5eed1
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Feb 13 18:11:09 2014 +0100

    install-ng: since kernel may not installed.... use rpm as reference

diff --git a/src/install/detect_os b/src/install/detect_os
index ff75650..fd15180 100755
--- a/src/install/detect_os
+++ b/src/install/detect_os
@@ -102,7 +102,7 @@ detect_version()
 	os=$(detect_os)
 	case $os in
 		centos|rhel|redhat_unknown|fedora)
-			release=$(rpm -q --queryformat='%{release}' kernel)
+			release=$(rpm -q --queryformat='%{release}' rpm)
 			version=${release##*.}
 			;;
 	esac

commit f04254df7864f599888a0e7b57af4026b22fc56d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Feb 13 18:00:00 2014 +0100

    install-ng: display target version for debug purpose

diff --git a/src/install-ng b/src/install-ng
index d5fbd7b..c5bf203 100755
--- a/src/install-ng
+++ b/src/install-ng
@@ -93,8 +93,9 @@ fusionforge_etc_dir=${FUSIONFORGE_ETC_DIR:-/etc/gforge}
 # Call to detect_os, this will set $type and $distrib
 os=$(detect_os)
 type=$(detect_type)
-targetversion=$(detect_version)
 echo "Install type = $type"
+targetversion=$(detect_version)
+echo "Target version (if any) = $targetversion"
 
 if $DEPS || $DEFAULT
 then

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

Summary of changes:
 src/install-ng        |    3 ++-
 src/install/detect_os |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list