From: Mark Hymers <mhy@debian.org>
Date: Sat, 30 Jul 2011 12:57:10 +0000 (+0100)
Subject: Merge remote branch 'ftpmaster/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=07f1501528d921e08f09fbb29452b3252e57aa2d;hp=0ca34d3d3ba917f3a1b1573534589da1fac25306;p=dak.git

Merge remote branch 'ftpmaster/master'
---

diff --git a/daklib/queue.py b/daklib/queue.py
index e12a9971..ec5afeb7 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2007,6 +2007,11 @@ distribution."""
         """
 
         cnf = Config()
+
+        # Skip all of this if not sending mail to avoid confusing people
+        if cnf.has_key("Dinstall::Options::No-Mail") and cnf["Dinstall::Options::No-Mail"]:
+            return summary
+
         announcetemplate = os.path.join(cnf["Dir::Templates"], 'process-unchecked.announce')
 
         # Only do announcements for source uploads with a recent dpkg-dev installed