From: Mark Hymers <mhy@debian.org>
Date: Sat, 30 Jul 2011 12:54:27 +0000 (+0100)
Subject: Bail out earlier
X-Git-Tag: debian-r/squeeze~94^2~8^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=79c5b95d945263aaaa3e035e6c90d12754960af3;p=dak.git

Bail out earlier

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

diff --git a/daklib/queue.py b/daklib/queue.py
index 514e3226..ba4869b2 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2000,6 +2000,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
@@ -2012,10 +2017,6 @@ distribution."""
 
         self.Subst["__SHORT_SUMMARY__"] = short_summary
 
-        # 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
-
         for dist in self.pkg.changes["distribution"].keys():
             suite = get_suite(dist)
             if suite is None: continue