From: Joey Hess <joey@kitenet.net>
Date: Sat, 18 May 2013 20:27:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/239c37989d4fb3e94c4c6db841a49a79b9ea040f?hp=c4c9c3683b449107b04b1cd0b07064d2f38985db

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/IkiWiki/Plugin/notifyemail.pm b/IkiWiki/Plugin/notifyemail.pm
index 2c1775f2e..b50a22a00 100644
--- a/IkiWiki/Plugin/notifyemail.pm
+++ b/IkiWiki/Plugin/notifyemail.pm
@@ -78,6 +78,7 @@ sub anonsubscribe ($$) {
 sub notify (@) {
 	my @files=@_;
 	return unless @files;
+	return if $config{rebuild};
 
 	eval q{use Mail::Sendmail};
 	error $@ if $@;
diff --git a/debian/changelog b/debian/changelog
index fb51569b3..07d955bb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20130505) UNRELEASED; urgency=low
     Closes: #707436
   * theme: Now <TMPL_IF THEME_$NAME> can be used in all templates when
     a theme is enabled.
+  * notifyemail: Fix bug that caused duplicate emails to be sent when
+    site was rebuilt.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 09 May 2013 10:47:18 -0400