Suite::%s::{Architectures,Components}, OverrideType, Section, Location::%s::Suites...

[dak.git] / denise

diff --git a/denise b/denise
index b17dad0537f5a8ec3fd61511a9831c5ca0aea3ca..3c702daedb641d5202a693fbcd1174548a6aa98f 100755 (executable)
--- 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.9 2001-11-18 19:57:58 rmurray Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: denise,v 1.11 2002-05-14 15:28:53 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;
 
 ################################################################################
@@ -84,15 +84,13 @@ 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)];
         for component in Cnf.SubTree("Component").List():
             if component == "mixed":
                 continue; # Ick
-            for type in Cnf.SubTree("OverrideType").List():
+            for type in Cnf.ValueList("OverrideType"):
                 if type == "deb":
                     override_type = "";
                 elif type == "udeb":
@@ -101,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);
@@ -118,7 +116,7 @@ def main ():
         if component == "mixed":
             continue;
         component_id = db_access.get_component_id(component);
-        for type in Cnf.SubTree("OverrideType").List():
+        for type in Cnf.ValueList("OverrideType"):
             if type == "deb":
                 override_type = "";
                 q = projectB.query("SELECT DISTINCT b.package FROM bin_associations ba, binaries b, files f, location l WHERE ba.suite = %s AND l.component = %s AND ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id));