From ccc8127b612d886ccfdc26366313f985393c18af Mon Sep 17 00:00:00 2001 From: James Troup Date: Wed, 21 Mar 2001 01:25:59 +0000 Subject: [PATCH] less debian.org hardcodings --- TODO | 2 -- katie.conf | 1 + katie.conf-non-US | 1 + melanie | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index e5a2d6e0..a7e59d71 100644 --- a/TODO +++ b/TODO @@ -33,8 +33,6 @@ Urgent Less Urgent ----------- - o configurize all the hardcoded Bcc's in mail templates - o melanie (and possibly others) hardcode @*debian.org all over the shop o melanie should warn/error on -C without -d o ziyi shouldn't really do stable diff --git a/katie.conf b/katie.conf index 1b81e329..2d957acc 100644 --- a/katie.conf +++ b/katie.conf @@ -23,6 +23,7 @@ Dinstall MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails BugServer "bugs.debian.org"; + PackagesServer "packages.debian.org"; NewAckList "/org/ftp.debian.org/katie/log"; LockFile "/org/ftp.debian.org/katie/lock"; Bcc "troup@auric.debian.org"; diff --git a/katie.conf-non-US b/katie.conf-non-US index f50bb6ee..0a1d2836 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -22,6 +22,7 @@ Dinstall MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails BugServer "bugs.debian.org"; + PackagesServer "packages.debian.org"; NewAckList "/org/non-us.debian.org/katie/log"; LockFile "/org/non-us.debian.org/katie/lock"; Bcc "troup@auric.debian.org"; diff --git a/melanie b/melanie index 2b66ed24..b4661b14 100755 --- a/melanie +++ b/melanie @@ -2,7 +2,7 @@ # General purpose archive tool for ftpmaster # Copyright (C) 2000, 2001 James Troup -# $Id: melanie,v 1.9 2001-03-21 01:05:07 troup Exp $ +# $Id: melanie,v 1.10 2001-03-21 01:25:59 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 @@ -101,10 +101,10 @@ def main (): carbon_copy = "" for copy_to in string.split(Options.get("Carbon-Copy")): if utils.str_isnum(copy_to): - carbon_copy = carbon_copy + copy_to + "@bugs.debian.org, " + carbon_copy = carbon_copy + copy_to + "@" + Cnf["Dinstall::BugServer"] + ", " elif copy_to == 'package': for package in arguments: - carbon_copy = carbon_copy + package + "@packages.debian.org, " + carbon_copy = carbon_copy + package + "@" + Cnf["Dinstall::PackagesServer"] + ", " elif '@' in copy_to: carbon_copy = carbon_copy + copy_to + ", " else: @@ -346,7 +346,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + Cnf["Dinstall::Bcc"]; else: Subst["__BCC__"] = "X-Filler: 42"; - Subst["__CC__"] = "X-Melanie: $Id: melanie,v 1.9 2001-03-21 01:05:07 troup Exp $\n" + carbon_copy[:-1]; + Subst["__CC__"] = "X-Melanie: $Id: melanie,v 1.10 2001-03-21 01:25:59 troup Exp $\n" + carbon_copy[:-1]; Subst["__SUITE_LIST__"] = suites_list; Subst["__SUMMARY__"] = summary; Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]; -- 2.39.5