aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-01-08 14:37:48 +0000
committerNicolas Vigier <boklm@mageia.org>2011-01-08 14:37:48 +0000
commit9fae0b6de0b5a21bc9985e6a4d85ae22bfe1f0d4 (patch)
tree441737c150953481c63411c9708393492d6f8413 /modules
parent88c21fbcb6395a4b516ce2668dcd95d71fe6f988 (diff)
downloadpuppet-9fae0b6de0b5a21bc9985e6a4d85ae22bfe1f0d4.tar
puppet-9fae0b6de0b5a21bc9985e6a4d85ae22bfe1f0d4.tar.gz
puppet-9fae0b6de0b5a21bc9985e6a4d85ae22bfe1f0d4.tar.bz2
puppet-9fae0b6de0b5a21bc9985e6a4d85ae22bfe1f0d4.tar.xz
puppet-9fae0b6de0b5a21bc9985e6a4d85ae22bfe1f0d4.zip
add an option to not send commits from some authors to cia
Diffstat (limited to 'modules')
-rw-r--r--modules/subversion/manifests/init.pp1
-rwxr-xr-xmodules/subversion/templates/ciabot_svn.sh5
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/subversion/manifests/init.pp b/modules/subversion/manifests/init.pp
index 94b50e56..228ac395 100644
--- a/modules/subversion/manifests/init.pp
+++ b/modules/subversion/manifests/init.pp
@@ -126,6 +126,7 @@ class subversion {
$commit_mail = '',
$cia_post = true,
$cia_module = 'default',
+ $cia_ignore_author = '',
$no_binary = false,
$syntax_check1 = '',
$syntax_check2 = '',
diff --git a/modules/subversion/templates/ciabot_svn.sh b/modules/subversion/templates/ciabot_svn.sh
index 9f30e173..bec23aad 100755
--- a/modules/subversion/templates/ciabot_svn.sh
+++ b/modules/subversion/templates/ciabot_svn.sh
@@ -66,6 +66,7 @@
project_name="Mageia"
module_name="<%= cia_module %>"
return_address="root@<%= domain %>"
+ignore_author="<%= cia_ignore_author %>"
# System
sendmail_command="/usr/sbin/sendmail -t"
@@ -80,6 +81,10 @@ REV="$2"
cia_address="cia@cia.navi.cx"
author=`svnlook author -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`
+if test -n "$ignore_author" && echo "$author" | grep -q "$ignore_author"
+then
+ exit 0
+fi
log=`svnlook log -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`
diff_lines=`svnlook diff -r "$REV" "$REPOS" | wc -l`
for file in `svnlook changed -r "$REV" "$REPOS" | cut -c 3- | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`; do