testing helps

diff --git a/TODO b/TODO
index 4d34642d8bf4335e64eeabb34691235945a0df38..0669de350536ce537450915ab5566af69455da78 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,7 +7,7 @@ Urgent
   o jenna doesn't handle arch: any -> arch: all transitions
 
   o direport misreports things as section 'devel'
- 
+
   o Fix rhona to obey StayOfExecution
 
   o rewrite shania to a) be sane, b) clean REJECT properly
@@ -34,6 +34,8 @@ Urgent
 Less Urgent
 -----------
 
+  o validate email addresses ?  harsh to reject tho [errge]
+
   o Rene doesn't look at debian-installer but should.
 
   o Rene also doesn't seem to warn about missing binary packages?

diff --git a/katie b/katie
index c0e0a87f8d859ff8084f47358a5a645cc808c3f8..cc826e77fc85a5429bb5ace58a8527cacdf7f5c8 100755 (executable)
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: katie,v 1.38 2001-04-13 20:18:41 troup Exp $
+# $Id: katie,v 1.39 2001-04-13 21:21:22 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -140,8 +140,9 @@ def check_changes(filename):
     global reject_message, changes, files
 
     # Default in case we bail out
-    (changes["changedby822"], changes["maintainer822"]) = Cnf["Dinstall::MyEmailAddress"]; 
-
+    changes["maintainer822"] = Cnf["Dinstall::MyEmailAddress"];
+    changes["changedby822"] = Cnf["Dinstall::MyEmailAddress"];
+    
     # Parse the .changes field into a dictionary
     try:
         changes = utils.parse_changes(filename, 0)
@@ -633,7 +634,7 @@ def update_subst (changes_filename):
     if changes["architecture"].has_key("source") and changes["changedby822"] != "" and (changes["changedby822"] != changes["maintainer822"]):
         Subst["__MAINTAINER_FROM__"] = changes["changedby822"];
         Subst["__MAINTAINER_TO__"] = changes["changedby822"] + ", " + changes["maintainer822"];
-        Subst["__MAINTAINER__"] = changes["changedby"];
+        Subst["__MAINTAINER__"] = changes.get("changed-by", "Unknown");
     else:
         Subst["__MAINTAINER_FROM__"] = changes["maintainer822"];
         Subst["__MAINTAINER_TO__"] = changes["maintainer822"];
@@ -1239,7 +1240,7 @@ def main():
     Subst = {}
     Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];
     Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"];
-    bcc = "X-Katie: $Revision: 1.38 $"
+    bcc = "X-Katie: $Revision: 1.39 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else: