[Fusionforge-commits] FusionForge branch master updated. 87307e6e93ce4e4d3bee395978411f71b444c0e0

Roland Mas lolando at fusionforge.org
Tue Dec 17 18:21:03 CET 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  87307e6e93ce4e4d3bee395978411f71b444c0e0 (commit)
       via  830cb10102707a1f6a96cbd59ffa0045f4cbf935 (commit)
      from  1d24984f47c331cd7d36ff637bd5d06b281c5c21 (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 87307e6e93ce4e4d3bee395978411f71b444c0e0
Merge: 1d24984 830cb10
Author: Roland Mas <lolando at debian.org>
Date:   Tue Dec 17 18:20:46 2013 +0100

    Merged from 5.2: Only pull loggerhead from jessie if we're on wheezy

diff --cc tests/scripts/fusionforge-build-and-test-deb.sh
index 40c814c,b982ff5..94a3001
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@@ -106,14 -91,14 +106,16 @@@ ssh root@$HOST "UCF_FORCE_CONFFNEW=yes 
  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 "apt-get update"
 +
  ssh root@$HOST "echo \"deb file:/debian $DIST main\" >> /etc/apt/sources.list"
  scp -r $WORKSPACE/build/debian root@$HOST:/ 
  gpg --export --armor | ssh root@$HOST "apt-key add -"

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

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


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list