From 85ede4c945cc40722bf71c86c8e5702445dfd227 Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Fri, 23 Nov 2012 22:13:11 +0100 Subject: [PATCH] renewal-script: Make it not mail if there are no members needing renewal --- bin/mail_renewals_to_foundation_list.py | 26 ++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/bin/mail_renewals_to_foundation_list.py b/bin/mail_renewals_to_foundation_list.py index 19eb7cf..22d576e 100755 --- a/bin/mail_renewals_to_foundation_list.py +++ b/bin/mail_renewals_to_foundation_list.py @@ -60,18 +60,22 @@ def main(options=None): members = get_members_which_need_renewal('month') - emailtext = format_members_for_mail(members) + if not members: + log.warn('No one needs renewals! :-)') - today = datetime.date.today() - subject = "Memberships needing renewal (%s)" % today.strftime("%02Y-%02m") - - if sendmail: - log.warn('Sending mail to %s: %s', to, subject) - send_email(to, subject, emailtext) - else: - log.info('Not sending mail to %s', to) - log.info('%s', subject) - log.info('%s', emailtext) + else: # We do have members + emailtext = format_members_for_mail(members) + + today = datetime.date.today() + subject = "Memberships needing renewal (%s)" % today.strftime("%02Y-%02m") + + if sendmail: + log.warn('Sending mail to %s: %s', to, subject) + send_email(to, subject, emailtext) + else: + log.info('Not sending mail to %s', to) + log.info('%s', subject) + log.info('%s', emailtext) return 0