From: Roland Mas <lolando@debian.org>
Date: Fri, 2 Aug 2013 08:41:29 +0000 (+0200)
Subject: Merged from 5.2
X-Git-Tag: v5.3-rc1~1133
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=8006a6306caec9094e6da7e38790f759f1f1a700

Merged from 5.2
---

8006a6306caec9094e6da7e38790f759f1f1a700
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"