X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=melanie;h=b412a540d619d60f09757aae0e6ef36aa0fe116c;hb=a092f0aa8e82394e25a16da9e87263ee26b8de0e;hp=3dfae76da5459d55beaac90277fc5c135b602fcb;hpb=2640ce213afbd93f01d6cab41d903db852b7f5bf;p=dak.git

diff --git a/melanie b/melanie
index 3dfae76d..b412a540 100755
--- a/melanie
+++ b/melanie
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-# General purpose archive tool for ftpmaster
+# General purpose package removal tool for ftpmaster
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.16 2001-09-26 03:15:16 troup Exp $
+# $Id: melanie,v 1.17 2001-09-27 01:23:41 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
@@ -37,10 +37,10 @@ projectB = None;
 
 ################################################################################
 
-def usage (exit_code):
-    print """Usage: melanie [OPTIONS] package[...]
-  -D, --debug=VALUE          turn on debugging
-  -h, --help                 show this help and exit
+def usage (exit_code=0):
+    print """Usage: melanie [OPTIONS] PACKAGE[...]
+Remove PACKAGE(s) from suite(s).
+
   -a, --architecture=ARCH    only act on this architecture
   -b, --binary               remove binaries only
   -c, --component=COMPONENT  act on this component
@@ -50,7 +50,12 @@ def usage (exit_code):
   -n, --no-action            don't do anything
   -p, --partial              don't affect override files
   -s, --suite=SUITE          act on this suite
-  -S, --source-only          remove source only"""
+  -S, --source-only          remove source only
+  -h, --help                 show this help and exit
+
+ARCH, BUG#, COMPONENT and SUITE can be space seperated lists, e.g.
+    --architecture=\"m68k i386\""""
+
     sys.exit(exit_code)
 
 ################################################################################
@@ -75,9 +80,7 @@ def main ():
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
-    Arguments = [('D',"debug","Melanie::Options::Debug", "IntVal"),
-                 ('h',"help","Melanie::Options::Help"),
-                 ('V',"version","Melanie::Options::Version"),
+    Arguments = [('h',"help","Melanie::Options::Help"),
                  ('a',"architecture","Melanie::Options::Architecture", "HasArg"),
                  ('b',"binary", "Melanie::Options::Binary-Only"),
                  ('c',"component", "Melanie::Options::Component", "HasArg"),
@@ -90,11 +93,15 @@ def main ():
                  ('S',"source-only", "Melanie::Options::Source-Only"),
                  ];
 
+    for i in ["help", "architecture", "binary", "component", "carbon-copy", "done", "reason", "no-action", "partial", "source-only" ]:
+        Cnf["Melanie::Options::%s" % (i)] = "";
+    Cnf["Melanie::Options::Suite"] = "unstable";
+
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Melanie::Options")
 
     if Options["Help"]:
-	usage(0)
+	usage();
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
@@ -379,7 +386,7 @@ def main ():
         else:
             bcc = "Bcc: " + bcc;
         Subst["__BCC__"] = bcc[:-2];
-        Subst["__CC__"] = "X-Melanie: $Revision: 1.16 $\n" + carbon_copy[:-1];
+        Subst["__CC__"] = "X-Melanie: $Revision: 1.17 $\n" + carbon_copy[:-1];
         Subst["__SUITE_LIST__"] = suites_list;
         Subst["__SUMMARY__"] = summary;
         Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];