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 7771000f1f78e854823ce054ac6a90eae313815e (commit)
via 08a898fbff888da1d44a786b056f53c2e8c6f75d (commit)
via 264f16515ae258d39dc61fe641fcd975c27c74bc (commit)
from e3b676534b6a5c87aeaadf0e10fe425e27a5cd52 (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 7771000f1f78e854823ce054ac6a90eae313815e
Merge: e3b6765 08a898f
Author: Roland Mas <[email protected]>
Date: Wed Jun 3 13:33:50 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmhook/common/scmhookPlugin.class.php | 17 -----------------
tests/buildbot/push-packages-to-repositories.sh | 3 ++-
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/plugins/scmhook/common/scmhookPlugin.class.php
b/src/plugins/scmhook/common/scmhookPlugin.class.php
index b7f4159..e5ef7ba 100644
--- a/src/plugins/scmhook/common/scmhookPlugin.class.php
+++ b/src/plugins/scmhook/common/scmhookPlugin.class.php
@@ -345,11 +345,6 @@ project independently.");
echo ' disabled="disabled"';
echo ' />';
- if (in_array($hook->getClassname(),
$hooksEnabled)) {
- echo '<input type="hidden" ';
- echo
'name="'.$hook->getLabel().'_'.$hook->getClassname().'" ';
- echo 'value="on" />';
- }
echo '</td><td';
if (!$hook->isAvailable())
echo '
title="'.$hook->getDisabledMessage().'"';
@@ -416,12 +411,6 @@ project independently.");
echo ' disabled="disabled"';
echo ' />';
- if
(in_array($hookServePushPullBundle->getClassname(), $hooksEnabled)) {
- echo '<input type="hidden" ';
- echo
'name="'.$hookServePushPullBundle->getLabel().'_'.$hookServePushPullBundle->getClassname().'"
';
- echo 'value="on" />';
- }
-
echo '</td><td';
if (!$hookServePushPullBundle->isAvailable())
echo '
title="'.$hookServePushPullBundle->getDisabledMessage().'"';
@@ -471,12 +460,6 @@ project independently.");
echo ' disabled="disabled"';
echo ' />';
- if (in_array($hookPostReceive->getClassname(),
$hooksEnabled)) {
- echo '<input type="hidden" ';
- echo
'name="'.$hookPostReceive->getLabel().'_'.$hookPostReceive->getClassname().'" ';
- echo 'value="on" />';
- }
-
echo '</td><td';
if (!$hookPostReceive->isAvailable())
echo '
title="'.$hookPostReceive->getDisabledMessage().'"';
diff --git a/tests/buildbot/push-packages-to-repositories.sh
b/tests/buildbot/push-packages-to-repositories.sh
index 252527d..8a1d3ae 100755
--- a/tests/buildbot/push-packages-to-repositories.sh
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -43,7 +43,8 @@ case $method in
rpm)
rpmsign --addsign $WORKSPACE/packages/noarch/*.rpm
gpg --detach-sign --armor $WORKSPACE/packages/repodata/repomd.xml
- rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$dist-$branch/
+ rsync -av --delete $WORKSPACE/packages/
/var/lib/jenkins/rpm/$dist-$branch/
+ rsync -av --delete-after /var/lib/jenkins/rpm/
[email protected]:/home/groups/fusionforge/htdocs/rpm/
;;
*)
echo "Unknown install method"
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
