sync

[dak.git] / melanie

diff --git a/melanie b/melanie
index 2ac04a133a21426fa0f204d20f42cafb802ec53f..a0b7485ca39a85d9957dd5701f4e2b064cae0dca 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # 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 $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: melanie,v 1.24 2002-05-08 11:13:02 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
@@ -18,11 +18,29 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# X-Listening-To: Astronomy, Metallica - Garage Inc.
+################################################################################
+
+# o OpenBSD team wants to get changes incorporated into IPF. Darren no
+#    respond.
+# o Ask again -> No respond. Darren coder supreme.
+# o OpenBSD decide to make changes, but only in OpenBSD source
+#    tree. Darren hears, gets angry! Decides: "LICENSE NO ALLOW!"
+# o Insert Flame War.
+# o OpenBSD team decide to switch to different packet filter under BSD
+#    license. Because Project Goal: Every user should be able to make
+#    changes to source tree. IPF license bad!!
+# o Darren try get back: says, NetBSD, FreeBSD allowed! MUAHAHAHAH!!! 
+# o Theo say: no care, pf much better than ipf! 
+# o Darren changes mind: changes license. But OpenBSD will not change
+#    back to ipf. Darren even much more bitter.
+# o Darren so bitterbitter. Decides: I'LL GET BACK BY FORKING OPENBSD AND
+#    RELEASING MY OWN VERSION. HEHEHEHEHE.
+
+#                        http://slashdot.org/comments.pl?sid=26697&cid=2883271
 
 ################################################################################
 
-import commands, os, pg, pwd, re, string, sys, tempfile
+import commands, os, pg, re, string, sys, tempfile
 import utils, db_access
 import apt_pkg, apt_inst;
 
@@ -64,8 +82,7 @@ ARCH, BUG#, COMPONENT and SUITE can be space seperated lists, e.g.
 #  going to do now?"
 
 def game_over():
-    print "Continue (y/N)? ",
-    answer = string.lower(utils.our_raw_input());
+    answer = string.lower(utils.our_raw_input("Continue (y/N)? "));
     if answer != "y":
         print "Aborted."
         sys.exit(1);
@@ -122,7 +139,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 +149,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 +394,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.24 $";
         if carbon_copy:
             Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", ");
         Subst["__SUITE_LIST__"] = suites_list;
@@ -389,7 +408,7 @@ def main ():
         Subst["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"];
         for bug in string.split(Options["Done"]):
             Subst["__BUG_NUMBER__"] = bug;
-            mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/melanie.bug-close","r").read());
+            mail_message = utils.TemplateSubst(Subst,Cnf["Dir::TemplatesDir"]+"/melanie.bug-close");
             utils.send_mail (mail_message, "")
 
     logfile.write("=========================================================================\n");