X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=natalie.py;h=8fc1c0d9149885348c2ec3c4e1cb012f4b1db6e3;hb=73299e3d3d571ea12e5a08248420b8f93340cc0b;hp=d5a476d58d8e4893deb55e2cbeb4cfd89b948720;hpb=a092f0aa8e82394e25a16da9e87263ee26b8de0e;p=dak.git

diff --git a/natalie.py b/natalie.py
index d5a476d5..8fc1c0d9 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.11 2001-09-27 01:23:41 troup Exp $
+# $Id: natalie.py,v 1.15 2002-02-12 22:14:38 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
@@ -20,7 +20,7 @@
 
 ################################################################################
 
-import errno, os, pg, pwd, string, sys, time;
+import pg, string, sys, time;
 import utils, db_access, logging;
 import apt_pkg;
 
@@ -205,10 +205,7 @@ def list(suite, component, type):
 def main ():
     global Cnf, projectB, Logger;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
     Arguments = [('h',"help","Natalie::Options::Help"),
                  ('c',"component", "Natalie::Options::Component", "HasArg"),
                  ('l',"list", "Natalie::Options::List"),
@@ -218,10 +215,14 @@ def main ():
 
     # 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";
+	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);
 
@@ -245,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();