From c98964cc2c14c4ed4213b4283edf5e3f07c0d3ab Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 10 Jan 2024 21:26:54 +0100 Subject: [PATCH] - TLD, not PLD --- bin/pfa-from-incoming | 16 ++++++++-------- modules/config.py | 2 +- modules/mailer.py | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming index 1ea2d59..d49cbfc 100755 --- 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 cab0594..9153916 100644 --- 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 825446f..f03ec6a 100644 --- 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"] = "" \ + self.headers["Message-ID"] = "" \ % (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(): -- 2.46.0