X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=natalie.py;h=d6420951e6a9f037524a1dbb70fd88ba8d80e09f;hb=8d194d3676a27055a8a5f35a53a162334a090d26;hp=47c1410b85f41b9ab1299c1fa8cca7f92a07a3c7;hpb=89ada75793da6403e6ceb74a66a119621f19bba4;p=dak.git

diff --git a/natalie.py b/natalie.py
index 47c1410b..d6420951 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.9 2001-09-13 23:51:51 troup Exp $
+# $Id: natalie.py,v 1.14 2001-11-19 22:19:46 rmurray 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
@@ -196,36 +194,40 @@ def list(suite, component, type):
     if type == "dsc":
         q = projectB.query("SELECT o.package, s.section, o.maintainer FROM override o, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.section = s.id ORDER BY s.section, o.package" % (suite_id, component_id, type_id));
         for i in q.getresult():
-            print string.join(i, '\t');
+            print utils.result_join(i);
     else:
         q = projectB.query("SELECT o.package, p.priority, s.section, o.maintainer, p.level FROM override o, priority p, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.priority = p.id AND o.section = s.id ORDER BY s.section, p.level, o.package" % (suite_id, component_id, type_id));
         for i in q.getresult():
-	    if ( i[-2] ):
-		print string.join(i[:-1], '\t');
-	    else:
-		print string.join(i[:-2], '\t');
+            print utils.result_join(i[:-1]);
 
 ################################################################################
 
 def main ():
     global Cnf, projectB, Logger;
 
-    apt_pkg.init();
-
-    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"),
+    Cnf = utils.get_conf()
+    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" ]:
+	if not Cnf.has_key("Natalie::Options::%s" % (i)):
+	    Cnf["Natalie::Options::%s" % (i)] = "";
+    if not Cnf.has_key("Natalie::Options::Component"):
+	Cnf["Natalie::Options::Component"] = "main";
+    if not Cnf.has_key("Natalie::Options::Suite"):
+	Cnf["Natalie::Options::Suite"] = "unstable";
+    if not Cnf.has_key("Natalie::Options::Type"):
+	Cnf["Natalie::Options::Type"] = "deb";
+
     file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
     if Cnf["Natalie::Options::Help"]:
-        usage(0);
+        usage();
 
     init();
 
@@ -244,7 +246,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();