Revert "Send report mails separately to requester and list"

This reverts commit b2bdcf0e31ca6676086e8a5fd72d9a80cec2725e.

In retrospect this is not helping.
It also started causing mx to reject mails because of increased send rate,

diff --git a/PLD_Builder/report.py b/PLD_Builder/report.py
index 865fa4a095dbde34ee46cbbd989cce5d23dc5c96..f2b3436ea5d08c6c2a1f6222a6752d69672d0af8 100644 (file)
--- a/PLD_Builder/report.py
+++ b/PLD_Builder/report.py
@@ -72,8 +72,15 @@ def send_report(r, is_src = False):
     subject += ' '.join((s_failed, s_ok)).strip()
 
     m = mailer.Message()
+    m.set_headers(to = r.requester_email,
+                  cc = config.builder_list,
+                  subject = subject[0:100])
+    if is_src:
+        m.set_header("Message-ID", "<%s@pld.src.builder>" % r.id)
+    else:
+        m.set_header("References", "<%s@pld.src.builder>" % r.id)
+        m.set_header("In-Reply-To", "<%s@pld.src.builder>" % r.id)
 
-    m.write("Request by: %s\n\n" % r.requester_email)
     for b in r.batches:
         if b.build_failed and b.logfile == None:
             info = b.skip_reason
@@ -93,25 +100,6 @@ def send_report(r, is_src = False):
             m.append_log(b.logfile)
             m.write("\n\n")
 
-    m.set_headers(to = r.requester_email,
-                  subject = subject[0:100])
-    if is_src:
-        m.set_header("Message-ID", "<req-%s@pld.src.builder>" % r.id)
-    else:
-        m.set_header("References", "<req-%s@pld.src.builder>" % r.id)
-        m.set_header("In-Reply-To", "<req-%s@pld.src.builder>" % r.id)
-    m.send()
-
-    m.remove_header("To")
-    m.remove_header("Cc")
-    m.set_header("To", config.builder_list)
-    # reset Message-ID
-    m.set_std_headers()
-    if is_src:
-        m.set_header("Message-ID", "<%s@pld.src.builder>" % r.id)
-    else:
-        m.set_header("References", "<%s@pld.src.builder>" % r.id)
-        m.set_header("In-Reply-To", "<%s@pld.src.builder>" % r.id)
     m.send()
 
 def send_cia_report(r, is_src = False):