From d890ccc92cb93a9eee169a5cfc03a4e04b66690f Mon Sep 17 00:00:00 2001
From: Vsevolod Livinskiy <vsevolod.livinskij@frtk.ru>
Date: Tue, 8 Jul 2014 16:56:15 +0400
Subject: [PATCH] Unique way to send e-mail

---
 alloy.py | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/alloy.py b/alloy.py
index f4c1c411..ad08fed8 100755
--- a/alloy.py
+++ b/alloy.py
@@ -72,9 +72,11 @@ def try_do_LLVM(text, command, from_validation):
         postfix = " >> " + alloy_build + " 2>> " + alloy_build
     if os.system(command + postfix) != 0:
         print_debug("ERROR.\n", from_validation, alloy_build)
-        send_mail("ISPC test system download/build fail", "ISPC_test_system", options.notify,\
-                  "Unable to build or download something. See logs  for more information.", \
-                  alloy_build, "alloy_build.log")
+        if options.notify != "":
+            msg = MIMEMultipart()
+            attach_mail_file(msg, alloy_build, "alloy_build.log")
+            send_mail("ISPC test system download/build fail", "ISPC_test_system", options.notify,\
+                      "Unable to build or download something. See logs  for more information.", msg)
         error("can't " + text, 1)
     print_debug("DONE.\n", from_validation, alloy_build)
 
@@ -375,11 +377,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
         os.environ["PATH"] = os.environ["ISPC_HOME"] + ":" + os.environ["PATH"]
     if options.notify != "":
         common.remove_if_exists(os.environ["ISPC_HOME"] + os.sep + "notify_log.log")
-        smtp_server = os.environ["SMTP_ISPC"]
         msg = MIMEMultipart()
-        msg['Subject'] = 'ISPC test system results'
-        msg['From'] = 'ISPC_test_system'
-        msg['To'] = options.notify
     print_debug("Command: " + ' '.join(sys.argv) + "\n", False, "")
     print_debug("Folder: " + os.environ["ISPC_HOME"] + "\n", False, "")
     date = datetime.datetime.now()
@@ -623,29 +621,18 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
         for i in range(0,len(f_lines)):
             line = line + f_lines[i][:-1]
             line = line + '   \n'
-        text = MIMEText(line, "", "KOI-8")
-        msg.attach(text)
         attach_mail_file(msg, alloy_build, "alloy_build.log")
-        s = smtplib.SMTP(smtp_server)
+        send_mail("ISPC test system results", "ISPC_test_system", options.notify, line, msg)
 
-        print "Sending an e-mail with logs:", options.notify
-        for name in options.notify.split(" "):
-            print "Sending to: ", name
-            s.sendmail('ISPC_test_system', name, msg.as_string())
-        s.quit()
-
-def send_mail(subject, _from, to, line, attach_filename, attach_name):
+def send_mail(subject, from_field, to, line, msg):
         smtp_server = os.environ["SMTP_ISPC"]
-        msg = MIMEMultipart()
         msg['Subject'] = subject
-        msg['From'] = _from
+        msg['From'] = from_field
         msg['To'] = to
         text = MIMEText(line, "", "KOI-8")
         msg.attach(text)
-        attach_mail_file(msg, attach_filename, attach_name)
         s = smtplib.SMTP(smtp_server)
-        for name in options.notify.split(" "):
-            s.sendmail(_from, name, msg.as_string())
+        s.sendmail(from_field, options.notify.split(" "), msg.as_string())
         s.quit()
 
 def Main():