Give slightly nicer error message on db conn failure

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index e12a99715e255f335ba3c5adc43596abd7dc86a3..20e04bd6fa969fd65d6a76a29e9b23a5229d4ac5 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2007,13 +2007,18 @@ distribution."""
         """
 
         cnf = Config()
-        announcetemplate = os.path.join(cnf["Dir::Templates"], 'process-unchecked.announce')
+
+        # 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 ""
 
         # 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 = ""