From: James Troup Date: Sun, 11 Jun 2006 14:29:46 +0000 (+0100) Subject: Restore old X-Katie header contents temporarily as it's in use by 3rd parties. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1955704e1679c2061856a241f205efca4796f799;p=dak Restore old X-Katie header contents temporarily as it's in use by 3rd parties. --- diff --git a/ChangeLog b/ChangeLog index 3d7e0106..f8447816 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2006-06-11 James Troup + * dak/override.py (main): temporarily add content of old X-Katie + header back as the PTS apparently filters on it. + * dak/process_accepted.py (main): likewise. + * dak/process_new.py (main): likewise. + * dak/process_unchecked.py (main): likewise. + * dak/reject_proposed_updates.py (main): likewise. + * dak/rm.py (main): likewise. + * daklib/queue.py (Upload.do_reject): likewise. + * config/debian/cron.unchecked: set -u to error out on undefined variables. Preset LOCKDAILY to "" accordingly. * config/debian/cron.hourly: likewise. @@ -21,11 +30,11 @@ user back to list of known users as it's non-trivial to entirely change the owner of a database with postgresql 7.4. - * dak/daklib/queue.py (Upload.source_exists): use string object + * daklib/queue.py (Upload.source_exists): use string object methods rather than string module. (Upload.get_anyversion): likewise. - * dak/daklib/utils.py (validate_changes_file_arg): update filename + * daklib/utils.py (validate_changes_file_arg): update filename slicing to cope with new .dak filenames. * dak/ls.py (main): add back 'heidi' as a valid argument for diff --git a/dak/override.py b/dak/override.py index 60199c6e..7d9d80a2 100755 --- a/dak/override.py +++ b/dak/override.py @@ -221,7 +221,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "X-DAK: dak override" + Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia $Revision: 1.6$" Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"] Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"] Subst["__WHOAMI__"] = daklib.utils.whoami() diff --git a/dak/process_accepted.py b/dak/process_accepted.py index e791b43d..e03f7984 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -614,7 +614,7 @@ def main(): Urgency_Logger = Urgency_Log(Cnf) # Initialize the substitution template mapping global - bcc = "X-DAK: dak process-accepted\nX-Katie: this header is obsolete" + bcc = "X-DAK: dak process-accepted\nX-Katie: $Revision: 1.18 $" if Cnf.has_key("Dinstall::Bcc"): Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) else: diff --git a/dak/process_new.py b/dak/process_new.py index 3a1074c4..e5de419e 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -950,7 +950,7 @@ def main(): # Kill me now? **FIXME** Cnf["Dinstall::Options::No-Mail"] = "" - bcc = "X-DAK: dak process-new\nX-Katie: this header is obsolete" + bcc = "X-DAK: dak process-new\nX-Katie: lisa $Revision: 1.31 $" if Cnf.has_key("Dinstall::Bcc"): Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) else: diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index ec649f0b..1cf2234e 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -1339,7 +1339,7 @@ def main(): Logger = Upload.Logger = daklib.logging.Logger(Cnf, "process-unchecked") # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header - bcc = "X-DAK: dak process-unchecked\nX-Katie: this header is obsolete" + bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $" if Cnf.has_key("Dinstall::Bcc"): Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) else: diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py index c1639ad8..d78fe598 100755 --- a/dak/reject_proposed_updates.py +++ b/dak/reject_proposed_updates.py @@ -73,7 +73,7 @@ def main(): Upload = daklib.queue.Upload(Cnf) Logger = Upload.Logger = daklib.logging.Logger(Cnf, "reject-proposed-updates") - bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: this header is obsolete" + bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: lauren $Revision: 1.4 $" if Cnf.has_key("Dinstall::Bcc"): Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) else: diff --git a/dak/rm.py b/dak/rm.py index 61b82a40..37cdad28 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -510,7 +510,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: this header is obsolete" + Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie $Revision: 1.44 $" 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 0a03d1fe..6dc0cd9e 100644 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -644,7 +644,7 @@ distribution.""" if not manual: Subst["__REJECTOR_ADDRESS__"] = Cnf["Dinstall::MyEmailAddress"] Subst["__MANUAL_REJECT_MESSAGE__"] = "" - Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)" + Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)\nX-Katie-Rejection: automatic (moo)" os.write(reason_fd, reject_message) reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/dak.rejected") else: