less debian.org hardcodings

diff --git a/TODO b/TODO
index e5a2d6e06cfaf6501cc210a5983550d233374f48..a7e59d71d2b16b9a9e6e7033e008f2d6904d0e67 100644 (file)
--- 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 1b81e3297ecc9020e567630d1781921b5dd7d333..2d957acc3da9c809932345b938802fef3ff3274e 100644 (file)
--- 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 f50bb6eef97355e2ac9b188cee56df4e48fc20ea..0a1d2836f14ed5bbed5b01bb0338dca88bc6de57 100644 (file)
--- 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 2b66ed24c1c662e6c39a6b5c8233aa6cf73f1650..b4661b1468064bc3b1e64044ab9975459fb2a5f4 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose archive tool for ftpmaster
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $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"];