IntLevel fix for Shania. tbm's TrackingServer patch and comment typo.

diff --git a/docs/README.config b/docs/README.config
index 67b487521c39577c75a977f98f3d9bb2caee4e0a..89b33d3c0314d1299b17235a9b03c5ac0d895611 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -90,6 +90,7 @@ Mandatory.  List of dinstall options, e.g.:
 |    MyDistribution "Debian";
 |    BugServer "bugs.debian.org";
 |    PackagesServer "packages.debian.org";
+|    TrackingServer "packages.qa.debian.org";
 |    NewAckList "/org/ftp.debian.org/katie/log";
 |    LockFile "/org/ftp.debian.org/katie/lock";
 |    Bcc "archive@ftp-master.debian.org";
@@ -111,6 +112,10 @@ BugServer is used by katie and melanie when closing bugs.
 PackagesServer is used by melanie when carbon-copying a bug close mail
 to a package maintainer.
 
+TrackingServer is used by katie and melanie to send messages for the
+maintainer also to an alias for people tracking a specific source
+package.
+
 NewAckList is a mandatory field and contains the filename of list of
 NEW packages dinstall knows about and is used when dinstall is running
 in -k/--ack-new mode (usually in the daily cron run).

diff --git a/katie b/katie
index 19e8a7f7c246173a327767e768b304e09aca0823..7decb53a352e7f4365b6ce1dde7d773775436d3c 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.67 2001-11-25 01:21:34 troup Exp $
+# $Id: katie,v 1.68 2002-01-28 18:53:01 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.67 $";
+katie_version = "$Revision: 1.68 $";
 
 ###############################################################################
 
@@ -811,6 +811,8 @@ def update_subst (changes_filename):
         Subst["__MAINTAINER_FROM__"] = changes["maintainer822"];
         Subst["__MAINTAINER_TO__"] = changes["maintainer822"];
         Subst["__MAINTAINER__"] = changes.get("maintainer", "Unknown");
+    if Cnf.has_key("Dinstall::TrackingServer") and changes.has_key("source"):
+        Subst["__MAINTAINER_TO__"] = Subst["__MAINTAINER_TO__"] + "\nBcc: %s@%s" % (changes.get("source"), Cnf["Dinstall::TrackingServer"])
 
     Subst["__REJECT_MESSAGE__"] = reject_message;
     Subst["__SOURCE__"] = changes.get("source", "Unknown");

diff --git a/katie.conf b/katie.conf
index ece51dd19d63dc6bce3f85a82afecc9b7244d3ba..98970b938cb450a2d377769f7caa930f1185fdbb 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -12,6 +12,7 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
+   TrackingServer "packages.qa.debian.org";
    NewAckList "/org/ftp.debian.org/katie/log";
    LockFile "/org/ftp.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";

diff --git a/katie.conf-non-US b/katie.conf-non-US
index b12b49e38dc81f920a8386a1ed3a98bf46951cea..ab7c00e5ee7d9152222135916ff0e0a4205e7672 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -12,6 +12,7 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
+   TrackingServer "packages.qa.debian.org";
    NewAckList "/org/non-us.debian.org/katie/log";
    LockFile "/org/non-us.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";

diff --git a/melanie b/melanie
index 2ac04a133a21426fa0f204d20f42cafb802ec53f..aa7bd05e9d3ff9be1836ec4728efb7a8ad1b0ef1 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose package removal tool for ftpmaster
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.20 2001-11-19 03:56:29 rmurray Exp $
+# $Id: melanie,v 1.21 2002-01-28 18:53:01 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
@@ -122,7 +122,7 @@ def main ():
     #
     # Accept 3 types of arguments (space separated):
     #  1) a number - assumed to be a bug number, i.e. nnnnn@bugs.debian.org
-    #  2) the keyword 'package' - cc's $arch@packages.debian.org for every argument
+    #  2) the keyword 'package' - cc's $package@packages.debian.org for every argument
     #  3) contains a '@' - assumed to be an email address, used unmofidied
     #
     carbon_copy = [];
@@ -132,6 +132,8 @@ def main ():
         elif copy_to == 'package':
             for package in arguments:
                 carbon_copy.append(package + "@" + Cnf["Dinstall::PackagesServer"]);
+                if Cnf.has_key("Dinstall::TrackingServer"):
+                    carbon_copy.append(package + "@" + Cnf["Dinstall::TrackingServer"]);
         elif '@' in copy_to:
             carbon_copy.append(copy_to);
         else:
@@ -375,7 +377,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", ");
         else:
             Subst["__BCC__"] = "X-Filler: 42";
-        Subst["__CC__"] = "X-Melanie: $Revision: 1.20 $";
+        Subst["__CC__"] = "X-Melanie: $Revision: 1.21 $";
         if carbon_copy:
             Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", ");
         Subst["__SUITE_LIST__"] = suites_list;

diff --git a/shania b/shania
index 069df37d076829f35985650efe1d2e97d91b00f8..66d8771c744301ac2a6af494b4de0cffa175ed50 100755 (executable)
--- a/shania
+++ b/shania
@@ -2,7 +2,7 @@
 
 # Clean incoming of old unused files
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: shania,v 1.10 2001-11-19 20:42:40 rmurray Exp $
+# $Id: shania,v 1.11 2002-01-28 18:53:01 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
@@ -182,7 +182,7 @@ def main ():
        Cnf["Shania::Options::Days"] = "14";
 
     Arguments = [('h',"help","Shania::Options::Help"),
-                 ('d',"days","Shania::Options::Days", "IntVal"),
+                 ('d',"days","Shania::Options::Days", "IntLevel"),
                  ('i',"incoming","Shania::Options::Incoming", "HasArg"),
                  ('n',"no-action","Shania::Options::No-Action"),
                  ('v',"verbose","Shania::Options::Verbose")];