Restore old X-Katie header contents temporarily as it's in use by 3rd parties.

diff --git a/ChangeLog b/ChangeLog
index 3d7e01063709d537c49e5afbb74f5f154a167b28..f84478160ad8f20026cf6698b50a022c40e5c277 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-06-11  James Troup  <james@nocrew.org>
 
+       * 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 60199c6e044c79faaff88ed22eb7f7aff19815b7..7d9d80a26187dcc4dc293d57e9c4de8365635906 100755 (executable)
--- 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 e791b43d46a344d402f42fffa022c9e53ad26f7a..e03f798459b163d0b0b04c36f85a098e57b08a1e 100755 (executable)
--- 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 3a1074c49202e7a5ce87373461fabcf83f6e6fb9..e5de419e825e3779c83deb12c15d114ce21f94f0 100755 (executable)
--- 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 ec649f0bb825258500cec14b20fc0062c46f7123..1cf2234ecd2f10a4a0f6b132980e25e40f175f67 100755 (executable)
--- 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 c1639ad892c7faf9ef12f599dbd4bb129ac26198..d78fe598e4e181795cfedde13aa7ddac04e27efb 100755 (executable)
--- 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 61b82a40fe968d0cdcc2772d7e2d4909e655264b..37cdad28bbcd2e46bb019e3f60ce2a91b1fc439c 100755 (executable)
--- 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 0a03d1fe26a35c7e5a49e07bed326604d53b8274..6dc0cd9e96c1cb48985cdcc672e8135efd3e6eaa 100644 (file)
--- 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: