Bail out earlier

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

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