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 e2c16ec549c3915b428785fac6301176679e4ab1 (commit)
via ecb207e113b33eab6e3706a0cfe0bc3ff1cc0126 (commit)
via 47aa32310af56c47df31937adbb87e14ee0c7dfa (commit)
from 2d2ca69b0f4b841b31c1ac21a80346ff7d891bec (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 e2c16ec549c3915b428785fac6301176679e4ab1
Merge: 2d2ca69 ecb207e
Author: Roland Mas <[email protected]>
Date: Mon Jun 1 09:43:26 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/rpm/fusionforge.spec.in | 2 +-
tests/buildbot/fusionforge-build-and-test.sh | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index afc14d8..2541075 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -95,7 +95,7 @@ integrated into one web site and managed through a web
interface.
This package contains files and programs used by several other
subpackages.
%files common -f common.rpmfiles -f %{name}.lang
-%doc AUTHORS* CHANGES COPYING INSTALL.TXT NEWS README
+%doc AUTHORS* CHANGES COPYING INSTALL.TXT README
%doc docs/*
%doc rpm/README.fedora
%post common
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 6961257..80dc556 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,14 +98,16 @@ ssh root@$HOST
"/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
copy_logs
-case $INSTALL_METHOD in
- deb)
- rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
- ;;
- rpm)
- rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
- ;;
-esac
+if [ $retcode = 0 ] ; then
+ case $INSTALL_METHOD in
+ deb)
+ rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
+ ;;
+ rpm)
+ rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
+ ;;
+ esac
+fi
stop_vm_if_not_kept $HOST
exit $retcode
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
