mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-18 22:13:34 +08:00
build-many-glibcs: don't crash if email is not configured
The 'bot-cycle' action for build-many-glibcs is a convenient way to not have to remember all the steps in keeping a many-glibcs tree up to date ... or it would be, if the script could send mail _optionally_. Make it so by skipping the mail step if mail isn't configured. * scripts/build-many-glibcs.py (bot_build_mail): If the bot_config does not contain all of the necessary email- related settings, just print a warning and continue.
This commit is contained in:
parent
ceaa98897c
commit
f0166c1643
@ -1,3 +1,9 @@
|
||||
2017-02-16 Zack Weinberg <zackw@panix.com>
|
||||
|
||||
* scripts/build-many-glibcs.py (bot_build_mail): If the
|
||||
bot_config does not contain all of the necessary email-
|
||||
related settings, just print a warning and continue.
|
||||
|
||||
2017-02-16 Zack Weinberg <zackw@panix.com>
|
||||
|
||||
* crypt/md5.h: Test _LIBC with #if defined, not #if.
|
||||
|
@ -122,6 +122,7 @@ class Context(object):
|
||||
self.load_versions_json()
|
||||
self.load_build_state_json()
|
||||
self.status_log_list = []
|
||||
self.email_warning = False
|
||||
|
||||
def get_script_text(self):
|
||||
"""Return the text of this script."""
|
||||
@ -1003,6 +1004,15 @@ class Context(object):
|
||||
|
||||
def bot_build_mail(self, action, build_time):
|
||||
"""Send email with the results of a build."""
|
||||
if not ('email-from' in self.bot_config and
|
||||
'email-server' in self.bot_config and
|
||||
'email-subject' in self.bot_config and
|
||||
'email-to' in self.bot_config):
|
||||
if not self.email_warning:
|
||||
print("Email not configured, not sending.")
|
||||
self.email_warning = True
|
||||
return
|
||||
|
||||
build_time = build_time.replace(microsecond=0)
|
||||
subject = (self.bot_config['email-subject'] %
|
||||
{'action': action,
|
||||
|
Loading…
Reference in New Issue
Block a user