[Fusionforge-commits] FusionForge branch master updated. 8006a6306caec9094e6da7e38790f759f1f1a700

Roland Mas lolando at fusionforge.org
Fri Aug 2 11:03:07 CEST 2013


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  8006a6306caec9094e6da7e38790f759f1f1a700 (commit)
       via  ff9d956e8682737c5cf125fc9ae133e58c7b06cc (commit)
      from  cc87f244ae8e229f69fd5a42bbe087a41304f714 (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 8006a6306caec9094e6da7e38790f759f1f1a700
Merge: cc87f24 ff9d956
Author: Roland Mas <lolando at debian.org>
Date:   Fri Aug 2 10:41:29 2013 +0200

    Merged from 5.2

diff --cc tests/scripts/fusionforge-build-and-test-deb.sh
index 4ae2a5b,10aecc6..8fde4a0
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@@ -88,12 -80,13 +88,15 @@@ cat tests/preseed/* | sed s/@FORGE_ADMI
  export DEBMIRROR DEBMIRRORSEC
  ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"
  ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources.list.d/security.list"
 +ssh root@$HOST "apt-get update"
 +ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes dist-upgrade"
  
+ ssh root@$HOST "apt-get update"
+ ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install libapache2-mod-wsgi nscd"
+ 
  ssh root@$HOST "echo \"deb $DEBMIRROR jessie main\" >> /etc/apt/sources.list.d/jessie.list"
  ssh root@$HOST "apt-get update"
- ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install loggerhead libapache2-mod-wsgi nscd"
+ ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -y --force-yes install loggerhead"
  ssh root@$HOST "rm /etc/apt/sources.list.d/jessie.list"
  
  ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list"

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

Summary of changes:
 tests/scripts/fusionforge-build-and-test-deb.sh |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list