From: Mark Hymers <mhy@debian.org>
Date: Sat, 30 Jul 2011 20:55:49 +0000 (+0100)
Subject: Fix NoMail case
X-Git-Tag: debian-r/squeeze~94^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=379a8dd982fa7a20cdb6efaa39998872b3868eee;p=dak.git

Fix NoMail case

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index ec5afeb7..20e04bd6 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2010,15 +2010,15 @@ distribution."""
 
         # 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')
+            return ""
 
         # Only do announcements for source uploads with a recent dpkg-dev installed
         if float(self.pkg.changes.get("format", 0)) < 1.6 or not \
            self.pkg.changes["architecture"].has_key("source"):
             return ""
 
+        announcetemplate = os.path.join(cnf["Dir::Templates"], 'process-unchecked.announce')
+
         lists_done = {}
         summary = ""