Use Revision not Id in X-Melanie line.

[dak.git] / melanie

diff --git a/melanie b/melanie
index 2b66ed24c1c662e6c39a6b5c8233aa6cf73f1650..c3efc64f2f6beba800fe756c37e5c8bac4257c5f 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.11 2001-03-21 05:37:43 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: $Revision: 1.11 $\n" + carbon_copy[:-1];
         Subst["__SUITE_LIST__"] = suites_list;
         Subst["__SUMMARY__"] = summary;
         Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];