Merge remote branch 'ftpmaster/master'

diff --git a/daklib/queue.py b/daklib/queue.py
index e12a99715e255f335ba3c5adc43596abd7dc86a3..ec5afeb7fd707977046437a3f84ad12032f2bca5 100755 (executable)
--- 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