X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=a134935715d28cd337bcaa00158c33889d5b872d;hb=f22f57084bb5a6c4b30cd2dfcd138c9976db7fbf;hp=7d7ed1025c124407b35b1ece99163bd5b8458ebe;hpb=5f1c041b6360046ba2a6cdd3fa41ddaac036d7a3;p=dak.git

diff --git a/denise b/denise
index 7d7ed102..a1349357 100755
--- a/denise
+++ b/denise
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Output override files for apt-ftparchive and indices/
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: denise,v 1.8 2001-09-17 11:18:37 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: denise,v 1.10 2002-05-08 11:13:02 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
@@ -25,7 +25,7 @@
 ################################################################################
 
 import pg, sys, string
-import utils, db_access, natalie
+import utils, db_access
 import apt_pkg;
 
 ################################################################################
@@ -75,10 +75,7 @@ def list(suite, component, type):
 def main ():
     global Cnf, projectB, override;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
     Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"),
                  ('h',"help","Denise::Options::Help"),
                  ('V',"version","Denise::Options::Version")];
@@ -87,8 +84,6 @@ def main ():
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
-    natalie.init();
-
     for suite in [ "stable", "unstable" ]:
         sys.stderr.write("Processing %s...\n" % (suite));
         override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)];
@@ -104,7 +99,7 @@ def main ():
                     override_type = ".debian-installer";
                 elif type == "dsc":
                     override_type = ".src";
-                filename = "%s/override.%s.%s%s" % (Cnf["Dir::OverrideDir"], override_suite, string.replace(component, "non-US/", ""), override_type);
+                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, string.replace(component, "non-US/", ""), override_type);
                 file = utils.open_file(filename, 'w');
                 sys.stdout = file;
                 list(suite, component, type);