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

diff --git a/natalie.py b/natalie.py
index 8626798e..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.12 2001-11-04 22:28:44 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);