From: Joerg Jaspert Date: Wed, 28 Oct 2009 13:13:59 +0000 (+0100) Subject: Remove X-Katie: headers X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83f868120d67c62349c628ee154885508bedc2b0;p=dak Remove X-Katie: headers Signed-off-by: Joerg Jaspert --- diff --git a/dak/override.py b/dak/override.py index 413c3447..e2539677 100755 --- a/dak/override.py +++ b/dak/override.py @@ -240,7 +240,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "Cc: " + package + "@" + Cnf["Dinstall::PackagesServer"] + "\nX-DAK: dak override\nX-Katie: alicia" + Subst["__CC__"] = "Cc: " + package + "@" + Cnf["Dinstall::PackagesServer"] + "\nX-DAK: dak override" Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"] Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"] Subst["__WHOAMI__"] = utils.whoami() diff --git a/dak/process_accepted.py b/dak/process_accepted.py index b18346c8..b203f498 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -582,7 +582,7 @@ def stable_install(u, session, summary, short_summary, fromsuite_name="proposed- if not Options["No-Mail"] and u.pkg.changes["architecture"].has_key("source"): u.Subst["__SUITE__"] = " into %s" % (tosuite) u.Subst["__SUMMARY__"] = summary - u.Subst["__BCC__"] = "X-DAK: dak process-accepted\nX-Katie: $Revision: 1.18 $" + u.Subst["__BCC__"] = "X-DAK: dak process-accepted" if cnf.has_key("Dinstall::Bcc"): u.Subst["__BCC__"] += "\nBcc: %s" % (cnf["Dinstall::Bcc"]) diff --git a/dak/process_new.py b/dak/process_new.py index 1423d705..9a6c8e33 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -975,7 +975,7 @@ def do_pkg(changes_file, session): u.update_subst() cnf = Config() - bcc = "X-DAK: dak process-new\nX-Katie: lisa $Revision: 1.31 $" + bcc = "X-DAK: dak process-new" if cnf.has_key("Dinstall::Bcc"): u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) else: diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 34020205..5688e83f 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -455,7 +455,7 @@ def process_it(changes_file): u.pkg.changes["changedby2047"] = cnf["Dinstall::MyEmailAddress"] # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header - bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $" + bcc = "X-DAK: dak process-unchecked" if cnf.has_key("Dinstall::Bcc"): u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) else: diff --git a/dak/rm.py b/dak/rm.py index 51400194..be3e1676 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -550,7 +550,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie" + Subst["__CC__"] = "X-DAK: dak rm" if carbon_copy: Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy) Subst["__SUITE_LIST__"] = suites_list diff --git a/daklib/queue.py b/daklib/queue.py index 479bb3b9..1d2a3275 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1918,7 +1918,7 @@ distribution.""" if not manual: self.Subst["__REJECTOR_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"] self.Subst["__MANUAL_REJECT_MESSAGE__"] = "" - self.Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)\nX-Katie-Rejection: automatic (moo)" + self.Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)" os.write(reason_fd, reject_message) reject_mail_message = utils.TemplateSubst(self.Subst, rej_template) else: @@ -2336,7 +2336,7 @@ distribution.""" self.Subst["__REJECTOR_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"] self.Subst["__REJECT_MESSAGE__"] = self.package_info() self.Subst["__CC__"] = "Cc: " + cnf["Dinstall::MyEmailAddress"] - self.Subst["__BCC__"] = "X-DAK: dak process-accepted\nX-Katie: $Revision: 1.18 $" + self.Subst["__BCC__"] = "X-DAK: dak process-accepted" if cnf.has_key("Dinstall::Bcc"): self.Subst["__BCC__"] += "\nBcc: %s" % (cnf["Dinstall::Bcc"])