- merged PLD changes, now it works with python 3.x

[tld-builder.git] / TLD_Builder / report.py

diff --git a/TLD_Builder/report.py b/TLD_Builder/report.py
index c6e629427af3900fc764bdbc5556561b64201b75..bfbc54e1ddec88e9fa6c262bf2355e808b14e82f 100644 (file)
--- a/TLD_Builder/report.py
+++ b/TLD_Builder/report.py
@@ -13,7 +13,7 @@ def unpackaged_files(b):
     f = open(b.logfile)
     copy_mode = 0
     out = []
-    for l in f.xreadlines():
+    for l in f:
         if l == msg:
             copy_mode = 1
             out.append(l)
@@ -41,7 +41,7 @@ def info_from_log(b, target):
     f = open(b.logfile)
     copy_mode = 0
     need_header = 1
-    for l in f.xreadlines():
+    for l in f:
         if l == beg:
             if need_header:
                 need_header = 0
@@ -72,8 +72,17 @@ 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@tld.src.builder>" % r.id)
+    else:
+        m.set_header("References", "<%s@tld.src.builder>" % r.id)
+        m.set_header("In-Reply-To", "<%s@tld.src.builder>" % r.id)
+
+    m.set_header("X-Entity-Ref-ID", "%s" % 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 +102,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@tld.src.builder>" % r.id)
-    else:
-        m.set_header("References", "<req-%s@tld.src.builder>" % r.id)
-        m.set_header("In-Reply-To", "<req-%s@tld.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@tld.src.builder>" % r.id)
-    else:
-        m.set_header("References", "<%s@tld.src.builder>" % r.id)
-        m.set_header("In-Reply-To", "<%s@tld.src.builder>" % r.id)
     m.send()
 
 def send_cia_report(r, is_src = False):