aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-08-18 20:20:55 +0100
committerColin Guthrie <colin@mageia.org>2013-08-18 20:20:55 +0100
commit43d422f4352586b4179c4d54f400109aab386410 (patch)
tree8f1b0ab23e0a7c13f54a79167bf840da6e8ad15a
parent4c1c6eb2455cc058c73b02ba652e0f40c869262f (diff)
downloadmgagit-43d422f4352586b4179c4d54f400109aab386410.tar
mgagit-43d422f4352586b4179c4d54f400109aab386410.tar.gz
mgagit-43d422f4352586b4179c4d54f400109aab386410.tar.bz2
mgagit-43d422f4352586b4179c4d54f400109aab386410.tar.xz
mgagit-43d422f4352586b4179c4d54f400109aab386410.zip
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.
-rw-r--r--tmpl/soft_repo.gl9
1 files 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 -%]