[Fusionforge-commits] FusionForge branch master updated. 238e316068a46672ac1e7a9bf5d0fd99df08f8ff

Sylvain Beucler beuc-inria at fusionforge.org
Thu Feb 13 15:18:07 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  238e316068a46672ac1e7a9bf5d0fd99df08f8ff (commit)
      from  780f5f4263ece8dd2014d56960bce102acbf1e1a (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 238e316068a46672ac1e7a9bf5d0fd99df08f8ff
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Feb 13 15:18:03 2014 +0100

    VM: fix package _re_build, and clean-ups

diff --git a/tools/VM-scripts/build.sh b/tools/VM-scripts/build.sh
index 3572dfd..c4b5a7e 100755
--- a/tools/VM-scripts/build.sh
+++ b/tools/VM-scripts/build.sh
@@ -82,7 +82,7 @@ if [ $? -eq 0 ]; then
 fi
 
 dch --newversion 999+$(date +%Y%m%d%H%M%S)-1 --distribution local --force-distribution "Autobuilt."
-debuild --no-lintian --no-tgz-check -us -uc -tc
+debuild --no-lintian --no-tgz-check -us -uc -tc  # using -tc so 'bzr st' is readable
 
 debrelease -f local
 mv $f debian/changelog
diff --git a/tools/VM-scripts/install.sh b/tools/VM-scripts/install.sh
index 5f8e630..4dc8394 100755
--- a/tools/VM-scripts/install.sh
+++ b/tools/VM-scripts/install.sh
@@ -21,18 +21,17 @@ fi
 set -e
 
 # "Backport" recent dependency
-wget http://ftp.fr.debian.org/debian/pool/main/l/loggerhead/loggerhead_1.19~bzr479-3_all.deb
+wget -c http://ftp.fr.debian.org/debian/pool/main/l/loggerhead/loggerhead_1.19~bzr479-3_all.deb
 aptitude install gdebi-core
 gdebi --non-interactive loggerhead_1.19~bzr479-3_all.deb
 
 aptitude update
 if dpkg -l fusionforge-full | grep -q ^ii ; then
     # Already installed, upgrading
-    /root/scripts/reload-db.sh
+    /root/fusionforge/tests/func/db_reload.sh
     UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y dist-upgrade
 else
     # Initial installation
-    UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y install postgresql-8.4
     UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y install gforge-db-postgresql
     UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y install fusionforge-full
     /usr/share/gforge/bin/forge_set_password admin myadmin

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

Summary of changes:
 tools/VM-scripts/build.sh   |    2 +-
 tools/VM-scripts/install.sh |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list