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

diff --git a/alyson b/alyson
index 62d98723b50fe3ad2816e818f7194c1dc76791f3..c26273f64d09082796ae8ba3ed57079efb6d6909 100755 (executable)
--- a/alyson
+++ b/alyson
@@ -2,7 +2,7 @@
 
 # Sync the ISC configuartion file and the SQL database
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: alyson,v 1.8 2002-05-03 16:06:45 troup Exp $
+# $Id: alyson,v 1.9 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
@@ -111,7 +111,7 @@ def main ():
         description = get(Suite, "Description");
         projectB.query("INSERT INTO suite (suite_name, version, origin, description) VALUES ('%s', %s, %s, %s)"
                        % (string.lower(suite), version, origin, description));
-        for architecture in Cnf.SubTree("Suite::%s::Architectures" % (suite)).List():
+        for architecture in Cnf.ValueList("Suite::%s::Architectures" % (suite)):
             architecture_id = db_access.get_architecture_id (architecture);
             if architecture_id < 0:
                 utils.fubar("architecture '%s' not found in architecture table for suite %s." % (architecture, suite));
@@ -122,7 +122,7 @@ def main ():
 
     projectB.query("BEGIN WORK");
     projectB.query("DELETE FROM override_type");
-    for type in Cnf.SubTree("OverrideType").List():
+    for type in Cnf.ValueList("OverrideType"):
         projectB.query("INSERT INTO override_type (type) VALUES ('%s')" % (type));
     projectB.query("COMMIT WORK");
 
@@ -152,7 +152,7 @@ def main ():
                 suffix = '/' + component;
             else:
                 suffix = "";
-        for section in Cnf.SubTree("Section").List():
+        for section in Cnf.ValueList("Section"):
             projectB.query("INSERT INTO section (section) VALUES ('%s%s%s')" % (prefix, section, suffix));
     projectB.query("COMMIT WORK");
 

diff --git a/andrea b/andrea
index 5c32e3ae90abadc2ee6f7305d3955f4e4ac3a5c6..4d2894e95e59b41e14bf849fb56a78796644093b 100755 (executable)
--- a/andrea
+++ b/andrea
@@ -2,7 +2,7 @@
 
 # Check for fixable discrepancies between stable and unstable
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: andrea,v 1.6 2002-05-03 16:06:45 troup Exp $
+# $Id: andrea,v 1.7 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
@@ -50,7 +50,7 @@ def main ():
     arch_all_id = db_access.get_architecture_id("all");
     dsc_type_id = db_access.get_override_type_id("dsc");
 
-    for arch in Cnf.SubTree("Suite::%s::Architectures" % (src_suite)).List():
+    for arch in Cnf.ValueList("Suite::%s::Architectures" % (src_suite)):
         if arch == "source":
             continue;
 

diff --git a/cindy b/cindy
index 022a5582431186dcaf10ea74309664d1c2e729ca..fe2e7272c99921f4f251cd709f5ca55d00de4d6c 100755 (executable)
--- a/cindy
+++ b/cindy
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: cindy,v 1.8 2002-05-03 16:06:45 troup Exp $
+# $Id: cindy,v 1.9 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
@@ -106,7 +106,7 @@ def main ():
         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"):
                 print "Processing %s [%s - %s]..." % (suite, component, type);
                process(suite, component, type);
 

diff --git a/claire.py b/claire.py
index cf47f172ad7dd819d4b23137f35ccde3135d8789..e6681a5bf2031c30f8a8f62f8257a038faf5ad04 100755 (executable)
--- a/claire.py
+++ b/claire.py
@@ -2,7 +2,7 @@
 
 # 'Fix' stable to make debian-cd and dpkg -BORGiE users happy
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: claire.py,v 1.13 2002-05-08 11:13:02 troup Exp $
+# $Id: claire.py,v 1.14 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
@@ -113,7 +113,7 @@ UNION SELECT DISTINCT ON (f.id) null, sec.section, l.path, f.filename, f.id
         dislocated_files[i[4]] = dest;
 
     # Binary
-    architectures = Cnf.SubTree("Suite::Stable::Architectures").List();
+    architectures = Cnf.ValueList("Suite::Stable::Architectures");
     for arch in [ "source", "all" ]:
         if architectures.count(arch):
             architectures.remove(arch);

diff --git a/denise b/denise
index a134935715d28cd337bcaa00158c33889d5b872d..3c702daedb641d5202a693fbcd1174548a6aa98f 100755 (executable)
--- a/denise
+++ b/denise
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: denise,v 1.10 2002-05-08 11:13:02 troup Exp $
+# $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
@@ -90,7 +90,7 @@ def main ():
         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":
@@ -116,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));

diff --git a/neve b/neve
index b29e5a53d67cb4c9fc85adb017ee23cd86b0de96..15883947487aaa65aeff10188e67594365d1e8e5 100755 (executable)
--- a/neve
+++ b/neve
@@ -2,7 +2,7 @@
 
 # Populate the DB
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: neve,v 1.9 2002-05-08 11:18:24 troup Exp $
+# $Id: neve,v 1.10 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
@@ -309,7 +309,7 @@ def update_suites ():
         for i in ("Version", "Origin", "Description"):
             if SubSec.has_key(i):
                 projectB.query("UPDATE suite SET %s = '%s' WHERE suite_name = '%s'" % (string.lower(i), SubSec[i], string.lower(suite)))
-        for architecture in Cnf.SubTree("Suite::%s::Architectures" % (suite)).List():
+        for architecture in Cnf.ValueList("Suite::%s::Architectures" % (suite)):
             architecture_id = db_access.get_architecture_id (architecture);
             projectB.query("INSERT INTO suite_architectures (suite, architecture) VALUES (currval('suite_id_seq'), %d)" % (architecture_id));
 
@@ -566,9 +566,9 @@ def main ():
             print 'Processing '+location+'...';
             process_packages (location, packages, suite, "", server);
         elif type == "legacy":
-            for suite in Cnf.SubTree("Location::%s::Suites" % (location)).List():
+            for suite in Cnf.ValueList("Location::%s::Suites" % (location)):
                 for component in Cnf.SubTree("Component").List():
-                    for architecture in Cnf.SubTree("Suite::%s::Architectures" % (suite)).List():
+                    for architecture in Cnf.ValueList("Suite::%s::Architectures" % (suite)):
                         if architecture == "source" or architecture == "all":
                             continue;
                         packages = location + Cnf.Find("Suite::%s::CodeName" % (suite)) + '/' + component + '/binary-' + architecture + '/Packages'