Sort files in action(). Typo in fubar msg

diff --git a/catherine b/catherine
index f7841b1214d36a02980ffcfdc6cfe9964a38652b..6ac76b54a5a4e2471f09c7c29e209c18b87999cc 100755 (executable)
--- a/catherine
+++ b/catherine
@@ -2,7 +2,7 @@
 
 # Poolify (move packages from "legacy" type locations to pool locations)
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: catherine,v 1.13 2001-11-18 19:57:58 rmurray Exp $
+# $Id: catherine,v 1.14 2001-11-19 00:26: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
@@ -94,7 +94,7 @@ def poolize (q, limit, verbose, no_action):
             if m != None:
                 source = m.group(1);
             else:
-                utils.fubar("expandsion of source filename '%s' failed." % (legacy_filename));
+                utils.fubar("expansion of source filename '%s' failed." % (legacy_filename));
         # Work out the component name
         component = qid["component"];
         if component == "":

diff --git a/katie b/katie
index eb7e0d8d9a631bf931e3e3372110284e2aa3226a..90e6655ad07c19ffbe91551ce4865d86cea353a6 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.63 2001-11-18 19:57:58 rmurray Exp $
+# $Id: katie,v 1.64 2001-11-19 00:26: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
@@ -70,7 +70,7 @@ orig_tar_location = "";
 legacy_source_untouchable = {};
 Subst = {};
 nmu = None;
-katie_version = "$Revision: 1.63 $";
+katie_version = "$Revision: 1.64 $";
 
 ###############################################################################
 
@@ -833,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 files_keys:
         if files[file].has_key("byhand"):
             byhand = 1
             summary = summary + file + " byhand\n"