[dak/master 2/2] Fix NoMail case
Signed-off-by: Mark Hymers <mhy@debian.org>
---
daklib/queue.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daklib/queue.py b/daklib/queue.py
index ec5afeb..20e04bd 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 = ""
--
1.7.2.5
Reply to: