X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=katie;h=ca28f4019aefc85711a3d2c6ad33cbdc19de043c;hb=fc1e81cf87861694e19b96afa8dd849dd967343c;hp=01a8313154030b0a79d4bb5ab4785f145decdbb6;hpb=74b5880be1419dac1f6a539c0af41547fb743793;p=dak.git

diff --git a/katie b/katie
index 01a83131..ca28f401 100755
--- 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.65 2001-11-19 02:02:53 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
@@ -70,17 +70,14 @@ orig_tar_location = "";
 legacy_source_untouchable = {};
 Subst = {};
 nmu = None;
-katie_version = "$Revision: 1.62 $";
+katie_version = "$Revision: 1.65 $";
 
 ###############################################################################
 
 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,7 +91,8 @@ 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")
@@ -835,7 +833,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"