Typo/thinko fixes.

diff --git a/TODO b/TODO
index 17ead560c683de1aabbeff02188c941f81f0e6c1..3367ef3374e1e6c029e8e8e97ff028ac5849694e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -34,7 +34,8 @@ Less Urgent
     o direport misreports things as section 'devel'
   
  * Easy:
-  
+
+    o denise abuses sys.stdout == badly  
     o utils.extract_component_from_section: main/utils -> main/utils, main rather than utils, main
     o Fix katie to remove != stable on stable install, not just f + u
     o Fix katie to warn if run when not in incoming or p-u

diff --git a/denise b/denise
index 2e2c16e40cbd374ad20e99bc614cb411263b56fa..5133e1d4a8bbf45ce439f0fb5a1d4efc10a95ca4 100755 (executable)
--- a/denise
+++ b/denise
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: denise,v 1.5 2001-06-22 22:53:14 troup Exp $
+# $Id: denise,v 1.6 2001-06-23 19:16:27 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
@@ -90,7 +90,7 @@ def main ():
     natalie.init();
 
     for suite in [ "stable", "unstable" ]:
-        print "Processing %s..." % (suite);
+        sys.stderr.write("Processing %s...\n" % (suite));
         override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)];
         for component in Cnf.SubTree("Component").List():
             if component == "mixed":
@@ -113,7 +113,7 @@ def main ():
     # Munge the override file for testing by using unstable's where
     # possible and falling back on stable's where it's not.
 
-    print "Processing testing...";
+    sys.stderr.write("Processing testing...\n");
     suite = "testing";
     suite_id = db_access.get_suite_id(suite);
     override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)];

diff --git a/katie b/katie
index 4db6937c47a7a989f24999f86290b9a7ad0031e4..0277650b9b01bcc077526b8b1c892aea5181d483 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.48 2001-06-23 16:57:26 troup Exp $
+# $Id: katie,v 1.49 2001-06-23 19:16:27 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
@@ -484,7 +484,7 @@ def check_files():
                 if changes["architecture"].has_key("source"):
                     source_version = files[file]["source version"];
                     if source_version != changes["version"]:
-                        reject_message = reject_message + "Rejected: source version (%s) for %s doesn't match changes version %s.\n" % (files[file]["sourceversion"], file, changes["version"]);
+                        reject_message = reject_message + "Rejected: source version (%s) for %s doesn't match changes version %s.\n" % (files[file]["source version"], file, changes["version"]);
                 else:
                     if not source_exists (files[file]["source package"], source_version):
                         reject_message = reject_message + "Rejected: no source found for %s %s (%s).\n" % (files[file]["source package"], source_version, file);
@@ -1332,7 +1332,7 @@ def main():
     Subst = {}
     Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];
     Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"];
-    bcc = "X-Katie: $Revision: 1.48 $"
+    bcc = "X-Katie: $Revision: 1.49 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else: