sync

[dak.git] / melanie

diff --git a/melanie b/melanie
index c76d7015d4dc19bcf537a1e1ab74873f202b30d9..377547a966797f4fcb789959614fd0d9be6a46c8 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.4 2001-01-31 03:36:36 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
@@ -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,7 +210,7 @@ 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);