[Fusionforge-commits] FusionForge branch master updated. 39400035c4807c8fa971815b9d4a3ce2613c74f1
Sylvain Beucler
beuc-inria at fusionforge.org
Thu Apr 10 17:19:50 CEST 2014
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 39400035c4807c8fa971815b9d4a3ce2613c74f1 (commit)
from c307e207f152ec897d772ff99b2f932b2129f943 (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 39400035c4807c8fa971815b9d4a3ce2613c74f1
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Thu Apr 10 17:19:34 2014 +0200
scmhook: make svn output stderr if a post-commit hook fails
diff --git a/src/plugins/scmhook/library/scmsvn/cronjobs/updateScmRepo.php b/src/plugins/scmhook/library/scmsvn/cronjobs/updateScmRepo.php
index 3757c21..f93d0f2 100644
--- a/src/plugins/scmhook/library/scmsvn/cronjobs/updateScmRepo.php
+++ b/src/plugins/scmhook/library/scmsvn/cronjobs/updateScmRepo.php
@@ -187,10 +187,11 @@ class ScmSvnUpdateScmRepo {
fwrite($file, file_get_contents(dirname(__FILE__).'/../skel/post-commit/head'));
$string = '';
foreach($newHooksPostCommit as $newHookPostCommit) {
- $string .= $newHookPostCommit->getHookCmd()."\n";
+ $string .= $newHookPostCommit->getHookCmd()." || error=1\n";
}
$string .= "\n";
fwrite($file, $string);
+ fwrite($file, file_get_contents(dirname(__FILE__).'/../skel/post-commit/tail'));
fclose($file);
copy('/tmp/post-commit-'.$unixname.'.tmp', $svndir_root.'/hooks/post-commit');
chmod($svndir_root.'/hooks/post-commit', 0755);
diff --git a/src/plugins/scmhook/library/scmsvn/skel/post-commit/head b/src/plugins/scmhook/library/scmsvn/skel/post-commit/head
index 1db0e34..7dbaa2b 100644
--- a/src/plugins/scmhook/library/scmsvn/skel/post-commit/head
+++ b/src/plugins/scmhook/library/scmsvn/skel/post-commit/head
@@ -2,3 +2,4 @@
SCRIPT=$(readlink -f $0)
SCRIPTPATH=`dirname $SCRIPT`
+error=0
diff --git a/src/plugins/scmhook/library/scmsvn/skel/post-commit/tail b/src/plugins/scmhook/library/scmsvn/skel/post-commit/tail
new file mode 100644
index 0000000..84537dd
--- /dev/null
+++ b/src/plugins/scmhook/library/scmsvn/skel/post-commit/tail
@@ -0,0 +1 @@
+exit $error # svn will display stderr if non-zero
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmhook/library/scmsvn/cronjobs/updateScmRepo.php | 3 ++-
src/plugins/scmhook/library/scmsvn/skel/post-commit/head | 1 +
src/plugins/scmhook/library/scmsvn/skel/post-commit/tail | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 src/plugins/scmhook/library/scmsvn/skel/post-commit/tail
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list