X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=natalie.py;h=8626798eb55d9da6963e6142c8137c07f99db287;hb=c1c7681bf43c58dd5cf34d1c1814a75ae594688b;hp=b37378ce8fba5b808ae97a09d47000c470dd1af1;hpb=5f1c041b6360046ba2a6cdd3fa41ddaac036d7a3;p=dak.git

diff --git a/natalie.py b/natalie.py
index b37378ce..8626798e 100755
--- a/natalie.py
+++ b/natalie.py
@@ -2,7 +2,7 @@
 
 # Manipulate override files
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: natalie.py,v 1.10 2001-09-17 11:18:37 troup Exp $
+# $Id: natalie.py,v 1.12 2001-11-04 22:28:44 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
@@ -32,11 +32,9 @@ Logger = None;
 
 ################################################################################
 
-def usage (exit_code):
+def usage (exit_code=0):
     print """Usage: natalie.py [OPTIONS]
-  -D, --debug=VALUE        debug
   -h, --help               this help
-  -V, --version            retrieve version
   -c, --component=CMPT     list/set overrides by component
                                   (contrib,*main,non-free)
   -s, --suite=SUITE        list/set overrides by suite
@@ -211,18 +209,24 @@ def main ():
 
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
-    Arguments = [('D',"debug","Natalie::Options::Debug", "IntVal"),
-                 ('h',"help","Natalie::Options::Help"),
-                 ('V',"version","Natalie::Options::Version"),
+    Arguments = [('h',"help","Natalie::Options::Help"),
                  ('c',"component", "Natalie::Options::Component", "HasArg"),
                  ('l',"list", "Natalie::Options::List"),
                  ('s',"suite","Natalie::Options::Suite", "HasArg"),
                  ('S',"set","Natalie::Options::Set"),
                  ('t',"type","Natalie::Options::Type", "HasArg")];
+
+    # Default arguments
+    for i in ["help", "list", "set" ]:
+        Cnf["Natalie::Options::%s" % (i)] = "";
+    Cnf["Natalie::Options::Component"] = "main";
+    Cnf["Natalie::Options::Suite"] = "unstable";
+    Cnf["Natalie::Options::Type"] = "deb";
+
     file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
     if Cnf["Natalie::Options::Help"]:
-        usage(0);
+        usage();
 
     init();
 
@@ -241,7 +245,7 @@ def main ():
         Logger = logging.Logger(Cnf, "natalie");
         if file_list != []:
             for file in file_list:
-                process_file(utils.open_file(file,'r'), suite, component, type);
+                process_file(utils.open_file(file), suite, component, type);
         else:
             process_file(sys.stdin, suite, component, type);
         Logger.close();