From 79c5b95d945263aaaa3e035e6c90d12754960af3 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Sat, 30 Jul 2011 13:54:27 +0100 Subject: [PATCH] Bail out earlier Signed-off-by: Mark Hymers --- daklib/queue.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 -- 2.39.2