From 43d422f4352586b4179c4d54f400109aab386410 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 18 Aug 2013 20:20:55 +0100 Subject: Simplify how the noemail option works Just use it to suppress the hooks.mailinglist git config value thus allowing us to use the upstream post-receive-email hook directly. --- tmpl/soft_repo.gl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tmpl/soft_repo.gl b/tmpl/soft_repo.gl index c28d3fb..58b73d7 100644 --- a/tmpl/soft_repo.gl +++ b/tmpl/soft_repo.gl @@ -12,16 +12,17 @@ repo [% repo %] [% END -%] RW+ user/USER/ = @all R = @all +[% IF r.repos.$repo.noemail -%] + config hooks.mailinglist = "" +[% ELSE -%] [% IF r.repos.$repo.mailinglist -%] config hooks.mailinglist = [% r.repos.$repo.mailinglist %] [% ELSE -%] config hooks.mailinglist = soft-commits@ml.mageia.org [% END -%] - config hooks.emailprefix = [% repo %] +[% END -%] + config hooks.emailprefix = "[% repo %] " config gitweb.description = [% r.repos.$repo.description %] [% IF r.users.$maintainer -%] config gitweb.owner = [% r.users.$maintainer.cn.0 %] - [% maintainer %] [% END -%] -[% IF r.repos.$repo.noemail -%] - config hooks.noemail = [% r.repos.$repo.noemail %] -[% END -%] -- cgit v1.2.1