From 904d0a564581ae27b6fdf534647976b39fe35229 Mon Sep 17 00:00:00 2001 From: James Troup Date: Sat, 23 Jun 2001 19:16:27 +0000 Subject: [PATCH] Typo/thinko fixes. --- TODO | 3 ++- denise | 6 +++--- katie | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 17ead560..3367ef33 100644 --- 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 2e2c16e4..5133e1d4 100755 --- a/denise +++ b/denise @@ -2,7 +2,7 @@ # Output override files for apt-ftparchive and indices/ # Copyright (C) 2000, 2001 James Troup -# $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 4db6937c..0277650b 100755 --- a/katie +++ b/katie @@ -2,7 +2,7 @@ # Installs Debian packaes # Copyright (C) 2000, 2001 James Troup -# $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: -- 2.39.5