okay, get rid of KatieDir, and add a which_apt_conf_file to utils.py instead

[dak.git] / melanie

diff --git a/melanie b/melanie
index c76d7015d4dc19bcf537a1e1ab74873f202b30d9..21e0cc7c13decaea6a1585568f56b77f03423017 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose archive tool for ftpmaster
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.3 2001-01-28 09:06:44 troup Exp $
+# $Id: melanie,v 1.6 2001-02-25 02:41:44 mjb 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
@@ -102,12 +102,12 @@ def main ():
     con_suites = "AND (";
     for suite in string.split(Cnf["Melanie::Options::Suite"]):
         
-        if suite == "stable":
+        if not Cnf["Melanie::Options::No-Action"] and suite == "stable":
             print "**WARNING** About to remove from the stable suite!"
             print "This should only be done just prior to a (point) release and not at"
             print "any other time."
             game_over();
-        elif suite == "testing":
+        elif not Cnf["Melanie::Options::No-Action"] and suite == "testing":
             print "**WARNING About to remove from the testing suite!"
             print "There's no need to do this normally as removals from unstable will"
             print "propogate to testing automagically."
@@ -210,11 +210,12 @@ def main ():
 
     # If we don't have a reason; spawn an editor so the user can add one
     # Write the rejection email out as the <foo>.reason file
-    if not Cnf["Melanie::Options::Reason"]:
+    if not Cnf["Melanie::Options::Reason"] and not Cnf["Melanie::Options::No-Action"]:
         temp_filename = tempfile.mktemp();
         fd = os.open(temp_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700);
         os.close(fd);
-        result = os.system("vi %s" % (temp_filename))
+        editor = os.environ.get("EDITOR","vi")
+        result = os.system("%s %s" % (editor, temp_filename))
         if result != 0:
             sys.stderr.write ("vi invocation failed for `%s'!" % (temp_filename))
             sys.exit(result)
@@ -328,6 +329,11 @@ master archive (ftp-master.debian.org) and will not propagate to any
 mirrors (ftp.debian.org included) until the next cron.daily run at the
 earliest.
 
+Packages are never removed from testing by hand.  Testing tracks
+unstable and will automatically remove packages which were removed
+from unstable when removing them from testing causes no dependency
+problems.
+
 Bugs which have been reported against this package are not automatically
 removed from the Bug Tracking System.  Please check all open bugs and
 close them or re-assign them to another package if the removed package