X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie;h=9efaa0beeef981b9bf32d0d8062b5339fc172761;hb=e2966876862103ac658e163683c0216da272419f;hp=c0e0a87f8d859ff8084f47358a5a645cc808c3f8;hpb=1bec8c1ed6ca4be8ac09d866c0869f8125c0caf8;p=dak.git

diff --git a/katie b/katie
index c0e0a87f..9efaa0be 100755
--- 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.41 2001-05-17 01:21:40 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,10 @@ 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"];
+    changes["architecture"] = {};
+    
     # Parse the .changes field into a dictionary
     try:
         changes = utils.parse_changes(filename, 0)
@@ -234,7 +236,7 @@ def check_changes(filename):
             # FIXME: should probably remove anything that != stable
             for i in ("frozen", "unstable"):
                 if changes["distribution"].has_key(i):
-                    reject_message = reject_message + "Removing %s from distribution list.\n"
+                    reject_message = reject_message + "Removing %s from distribution list.\n" % (i)
                     del changes["distribution"][i]
             changes["stable upload"] = 1;
             # If we can't find a file from the .changes; assume it's a package already in the pool and move into the pool
@@ -633,7 +635,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"];
@@ -938,7 +940,8 @@ def stable_install (changes_filename, summary, short_summary):
 
     projectB.query("COMMIT WORK");
 
-    utils.move (changes_filename, Cnf["Rhona::Morgue"] + os.path.basename(changes_filename));
+    # FIXME
+    utils.move (changes_filename, Cnf["Dir::Morgue"] + '/katie/' + os.path.basename(changes_filename));
 
     # Update the Stable ChangeLog file
 
@@ -970,6 +973,7 @@ def stable_install (changes_filename, summary, short_summary):
     if not Cnf["Dinstall::Options::No-Mail"]:
         Subst["__SUITE__"] = " into stable";
         Subst["__SUMMARY__"] = summary;
+        mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.installed","r").read());
         utils.send_mail (mail_message, "")
         announce (short_summary, 1)
 
@@ -1039,9 +1043,9 @@ def manual_reject (changes_filename):
     
     # If we weren't given one, spawn an editor so the user can add one in
     if manual_reject_message == "":
-        result = os.system("vi +6 %s" % (reject_file))
+        result = os.system("vi +6 %s" % (reject_filename))
         if result != 0:
-            sys.stderr.write ("vi invocation failed for `%s'!\n" % (reject_file))
+            sys.stderr.write ("vi invocation failed for `%s'!\n" % (reject_filename))
             sys.exit(result)
 
     # Then process it as if it were an automatic rejection
@@ -1239,7 +1243,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.41 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else: