X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=fernanda;h=466f6197c349bfd7271539154fe3aec0b7407e4c;hb=240185ce8d1003ad7a1a15817d1e0c2ee55675f3;hp=b9d8f50082b60eec25c991470abb70a571913d25;hpb=c1c7681bf43c58dd5cf34d1c1814a75ae594688b;p=dak.git

diff --git a/fernanda b/fernanda
index b9d8f500..466f6197 100755
--- a/fernanda
+++ b/fernanda
@@ -2,7 +2,7 @@
 
 # Script to automate some parts of checking NEW packages
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: fernanda,v 1.4 2001-11-04 22:28:44 troup Exp $
+# $Id: fernanda,v 1.5 2001-11-18 19:57:58 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
@@ -142,14 +142,12 @@ def check_changes (changes_filename):
 def main ():
     global Cnf, projectB, db_files, waste, excluded;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     Arguments = [('h',"help","Fernanda::Options::Help")];
     for i in [ "help" ]:
-        Cnf["Fernanda::Options::%s" % (i)] = "";
+	if not Cnf.has_key("Frenanda::Options::%s" % (i)):
+	    Cnf["Fernanda::Options::%s" % (i)] = "";
 
     args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Fernanda::Options")