Merge pull request #1894 from jberry-suse/devel-project-notify-smtp-exception-catch

devel-project: notify: catch smtp exceptions rather than crashing.
This commit is contained in:
Stephan Kulow 2019-03-09 07:45:07 +01:00 committed by GitHub
commit bb2cb5c6f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -100,6 +100,7 @@ def maintainer(args):
print('{} missing {}'.format(devel_project, ', '.join(desired - intersection)))
def notify(args):
import smtplib
apiurl = osc.conf.config['apiurl']
# devel_projects_get() only works for Factory as such
@ -138,8 +139,14 @@ in charge of the following packages:
- {}""".format(
args.project, '\n- '.join(sorted(package_identifiers)))
mail_send(apiurl, args.project, email, subject, message, dry=args.dry)
print('notified {} of {} packages'.format(userid, len(package_identifiers)))
log = 'notified {} of {} packages'.format(userid, len(package_identifiers))
try:
mail_send(apiurl, args.project, email, subject, message, dry=args.dry)
print(log)
except smtplib.SMTPRecipientsRefused as e:
print('[FAILED ADDRESS] {} ({})'.format(log, email))
except smtplib.SMTPException as e:
print('[FAILED SMTP] {} ({})'.format(log, e))
def requests(args):
apiurl = osc.conf.config['apiurl']