- PLD merge, fully (re)TLDized

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

diff --git a/PLD_Builder/report.py b/TLD_Builder/report.py
similarity index 74%
rename from PLD_Builder/report.py
rename to TLD_Builder/report.py
index a0fe7be98a2cca1872ae70532d6230fda606e060..c6e629427af3900fc764bdbc5556561b64201b75 100644 (file)
--- a/PLD_Builder/report.py
+++ b/TLD_Builder/report.py
@@ -18,26 +18,26 @@ def unpackaged_files(b):
             copy_mode = 1
             out.append(l)
         elif copy_mode:
-            if l[0] != ' ':
+            if l[0] != ' ' and l[0] != '\t':
                 copy_mode = 0
             else:
                 out.append(l)
     return out
 
-def add_pld_builder_info(b):
+def add_tld_builder_info(b):
     l = open(b.logfile, "a")
-    l.write("Begin-PLD-Builder-Info\n")
+    l.write("Begin-TLD-Builder-Info\n")
     l.write("Build-Time: %s\n\n" % b.build_time)
     st = ftp.status()
     if st != "":
         l.write("Files queued for ftp:\n%s\n" % st)
     ftp.clear_status()
     l.writelines(unpackaged_files(b))
-    l.write("End-PLD-Builder-Info\n")
+    l.write("End-TLD-Builder-Info\n")
 
 def info_from_log(b, target):
-    beg = "Begin-PLD-Builder-Info\n"
-    end = "End-PLD-Builder-Info\n"
+    beg = "Begin-TLD-Builder-Info\n"
+    end = "End-TLD-Builder-Info\n"
     f = open(b.logfile)
     copy_mode = 0
     need_header = 1
@@ -72,15 +72,8 @@ 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
@@ -100,6 +93,25 @@ 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):
@@ -112,12 +124,12 @@ def send_cia_report(r, is_src = False):
 
     m.set_headers(to = config.bot_email,
                   subject = subject)
-    m.set_header("Message-ID", "<%s@pld.src.builder>" % r.id)
+    m.set_header("Message-ID", "<%s@tld.src.builder>" % r.id)
     m.set_header("X-mailer", "$Id$")
-    m.set_header("X-builder", "PLD")
+    m.set_header("X-builder", "TLD")
 
     # get header of xml message from file
-    f = open(path.root_dir + '/PLD_Builder/cia-head.xml')
+    f = open(path.root_dir + '/TLD_Builder/cia-head.xml')
     m.write(f.read())
     f.close()
 
@@ -131,7 +143,7 @@ def send_cia_report(r, is_src = False):
         m.write('</package>\n')
 
     # get footer of xml message from file
-    f = open(path.root_dir + '/PLD_Builder/cia-foot.xml')
+    f = open(path.root_dir + '/TLD_Builder/cia-foot.xml')
     m.write(f.read())
     f.close()