IntLevel fix for Shania. tbm's TrackingServer patch and comment typo.

[dak.git] / katie

diff --git a/katie b/katie
index 01a8313154030b0a79d4bb5ab4785f145decdbb6..7decb53a352e7f4365b6ce1dde7d773775436d3c 100755 (executable)
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packages
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: katie,v 1.62 2001-11-04 22:41:31 troup Exp $
+# $Id: katie,v 1.68 2002-01-28 18:53:01 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
@@ -20,7 +20,7 @@
 
 # Originally based almost entirely on dinstall by Guy Maor <maor@debian.org>
 
-#########################################################################################
+###############################################################################
 
 #    Cartman: "I'm trying to make the best of a bad situation, I don't
 #              need to hear crap from a bunch of hippy freaks living in
@@ -30,7 +30,7 @@
 #
 #    Cartman: "uhh.. screw you guys... home."
 
-#########################################################################################
+###############################################################################
 
 import FCNTL, commands, fcntl, getopt, gzip, os, pg, pwd, re, shutil, stat, string, sys, tempfile, time, traceback
 import apt_inst, apt_pkg
@@ -70,17 +70,14 @@ orig_tar_location = "";
 legacy_source_untouchable = {};
 Subst = {};
 nmu = None;
-katie_version = "$Revision: 1.62 $";
+katie_version = "$Revision: 1.68 $";
 
 ###############################################################################
 
 def init():
     global Cnf, Options;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     Arguments = [('a',"automatic","Dinstall::Options::Automatic"),
                  ('h',"help","Dinstall::Options::Help"),
@@ -94,14 +91,15 @@ def init():
 
     for i in ["automatic", "help", "ack-new", "manual-reject", "no-action",
               "no-lock", "no-mail", "override-distribution", "version"]:
-        Cnf["Dinstall::Options::%s" % (i)] = "";
+       if not Cnf.has_key("Dinstall::Options::%s" % (i)):
+           Cnf["Dinstall::Options::%s" % (i)] = "";
 
     changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Dinstall::Options")
 
     return changes_files;
 
-#########################################################################################
+###############################################################################
 
 def usage (exit_code=0):
     print """Usage: dinstall [OPTION]... [CHANGES]...
@@ -813,6 +811,8 @@ def update_subst (changes_filename):
         Subst["__MAINTAINER_FROM__"] = changes["maintainer822"];
         Subst["__MAINTAINER_TO__"] = changes["maintainer822"];
         Subst["__MAINTAINER__"] = changes.get("maintainer", "Unknown");
+    if Cnf.has_key("Dinstall::TrackingServer") and changes.has_key("source"):
+        Subst["__MAINTAINER_TO__"] = Subst["__MAINTAINER_TO__"] + "\nBcc: %s@%s" % (changes.get("source"), Cnf["Dinstall::TrackingServer"])
 
     Subst["__REJECT_MESSAGE__"] = reject_message;
     Subst["__SOURCE__"] = changes.get("source", "Unknown");
@@ -835,7 +835,9 @@ def action (changes_filename):
             confirm.append(suite)
         suites.append(suite)
 
-    for file in files.keys():
+    file_keys = files.keys();
+    file_keys.sort();
+    for file in file_keys:
         if files[file].has_key("byhand"):
             byhand = 1
             summary = summary + file + " byhand\n"
@@ -914,7 +916,7 @@ def action (changes_filename):
     elif answer == 'Q':
         sys.exit(0)
 
-#####################################################################################################################
+###############################################################################
 
 def install (changes_filename, summary, short_summary):
     global install_count, install_bytes, Subst;
@@ -1063,7 +1065,7 @@ def install (changes_filename, summary, short_summary):
         announce (short_summary, 1)
         check_override ();
 
-#####################################################################################################################
+################################################################################
 
 def stable_install (changes_filename, summary, short_summary):
     global install_count, install_bytes, Subst;
@@ -1257,6 +1259,8 @@ def acknowledge_new (changes_filename, summary):
 
     changes_filename = os.path.basename(changes_filename);
 
+    Logger.log(["new",changes_filename]);
+
     new_ack_new[changes_filename] = 1;
 
     if new_ack_old.has_key(changes_filename):