- TLD, not PLD

diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index 1ea2d59ae3a7e4cf4067c0c860618e0cf1fe2c48..d49cbfc2286493fbf07b47c785f3110c70246a78 100755 (executable)
--- a/bin/pfa-from-incoming
+++ b/bin/pfa-from-incoming
@@ -65,12 +65,12 @@ def send_noarch_msg(files_differ, reqs_differ, pkg, rpmfile, arch):
     msg="From: %s\nTo: %s\n" % (cval['from_field'], req_email)
     if cc_list:
         msg=msg+"Cc: %s\n" % ", ".join(cc_list)
-    msg=msg+"""X-PLD-Builder: %s
-References: <%s@pld.src.builder>
-In-Reply-To: <%s@pld.src.builder>
+    msg=msg+"""X-TLD-Builder: %s
+References: <%s@tld.src.builder>
+In-Reply-To: <%s@tld.src.builder>
 Subject: %s
 
-""" % (cval['xpldbuilder'], req_bid, req_bid, m_subject)
+""" % (cval['xtldbuilder'], req_bid, req_bid, m_subject)
 
     sm = os.popen("/usr/sbin/sendmail -t", "w")
 
@@ -143,12 +143,12 @@ def send_vr_msg(snvr, anvr, pkg, arch):
     msg="From: %s\nTo: %s\n" % (cval['from_field'], req_email)
     if cc_list:
         msg=msg+"Cc: %s\n" % ", ".join(cc_list)
-    msg=msg+"""X-PLD-Builder: %s
-References: <%s@pld.src.builder>
-In-Reply-To: <%s@pld.src.builder>
+    msg=msg+"""X-TLD-Builder: %s
+References: <%s@tld.src.builder>
+In-Reply-To: <%s@tld.src.builder>
 Subject: %s
 
-""" % (cval['xpldbuilder'], req_bid, req_bid, m_subject)
+""" % (cval['xtldbuilder'], req_bid, req_bid, m_subject)
 
     sm = os.popen("/usr/sbin/sendmail -t", "w")
 

diff --git a/modules/config.py b/modules/config.py
index cab0594b267a4b2de9376e416bdc719923393e24..9153916d77dc852b238846f3d20866329eb2889a 100644 (file)
--- a/modules/config.py
+++ b/modules/config.py
@@ -73,4 +73,4 @@ else:
 if 'ftp_dist' in value:
     ftp_dist = value['ftp_dist']
 else:
-    ftp_dist = 'pld'
+    ftp_dist = 'tld'

diff --git a/modules/mailer.py b/modules/mailer.py
index 825446f36445e0f3c1fdf139835a31bfaf84c92a..f03ec6af6cfb02bfadaeea4366f921f0ff754c4f 100644 (file)
--- a/modules/mailer.py
+++ b/modules/mailer.py
@@ -42,10 +42,10 @@ class Message:
 
     def __set_std_headers(self):
         self.headers["Date"] = time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())
-        self.headers["Message-ID"] = "<pld-builder.%f.%d@%s>" \
+        self.headers["Message-ID"] = "<tld-builder.%f.%d@%s>" \
                 % (time.time(), os.getpid(), os.uname()[1])
         self.headers["From"] = cval['from_field']
-        self.headers["X-PLD-Builder"] = cval['xpldbuilder']
+        self.headers["X-TLD-Builder"] = cval['xtldbuilder']
 
     def __write_to(self, f):
         for k, v in self.headers.items():