From 830cb10102707a1f6a96cbd59ffa0045f4cbf935 Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Tue, 17 Dec 2013 18:19:51 +0100 Subject: [PATCH] Only pull loggerhead from jessie if we're on wheezy --- tests/scripts/fusionforge-build-and-test-deb.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh index 95ed9638d8..b982ff580b 100755 --- a/tests/scripts/fusionforge-build-and-test-deb.sh +++ b/tests/scripts/fusionforge-build-and-test-deb.sh @@ -91,10 +91,12 @@ ssh root@$HOST "echo \"deb $DEBMIRRORSEC $DIST/updates main\" > /etc/apt/sources 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 python" -ssh root@$HOST "rm /etc/apt/sources.list.d/jessie.list" +if [ "$DIST" = wheezy ] ; then + 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 python" + ssh root@$HOST "rm /etc/apt/sources.list.d/jessie.list" +fi ssh root@$HOST "echo \"deb $DEBMIRROR $DIST main\" > /etc/apt/sources.list" ssh root@$HOST "echo \"deb file:/debian $DIST main\" >> /etc/apt/sources.list" -- 2.30.2