From: James Troup <james@nocrew.org>
Date: Tue, 14 May 2002 15:34:02 +0000 (+0000)
Subject: Suite::%s::{Architectures,Components}, OverrideType, Section, Location::%s::Suites... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=cd3b031e17f5d17099ffefee5322928b9544fa32;p=dak.git

Suite::%s::{Architectures,Components}, OverrideType, Section, Location::%s::Suites and Urgency::Valid become ValueLists not Lists.
---

diff --git a/jenna b/jenna
index e388ca1b..a88718e0 100755
--- a/jenna
+++ b/jenna
@@ -2,7 +2,7 @@
 
 # Generate file list which is then fed to apt-ftparchive to generate Packages and Sources files
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: jenna,v 1.16 2002-05-08 11:13:02 troup Exp $
+# $Id: jenna,v 1.17 2002-05-14 15:34: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
@@ -252,12 +252,12 @@ def main():
         if not Cnf.has_key("Suite::%s::Components" % (suite)):
             components = "-";
         if components == "":
-            components = string.join(Cnf.SubTree("Suite::%s::Components" % (suite)).List());
+            components = string.join(Cnf.ValueList("Suite::%s::Components" % (suite)));
         for component in string.split(components):
             component = string.lower(component)
             architectures = Options["Architecture"];
             if architectures == "":
-                architectures = string.join(Cnf.SubTree("Suite::%s::Architectures" % (suite)).List());
+                architectures = string.join(Cnf.ValueList("Suite::%s::Architectures" % (suite)));
             for architecture in string.split(architectures):
                 architecture = string.lower(architecture)
                 if architecture == "all":
diff --git a/jeri b/jeri
index ce69162d..40594780 100755
--- a/jeri
+++ b/jeri
@@ -2,7 +2,7 @@
 
 # Dependency check proposed-updates
 # Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: jeri,v 1.5 2002-05-08 11:13:02 troup Exp $
+# $Id: jeri,v 1.6 2002-05-14 15:34: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
@@ -253,8 +253,8 @@ def parse_packages():
     # Parse the Packages files (since it's a sub-second operation on auric)
     suite = "stable";
     stable = {};
-    components = Cnf.SubTree("Suite::%s::Components" % (suite)).List();
-    architectures = Cnf.SubTree("Suite::%s::Architectures" % (suite)).List();
+    components = Cnf.ValueList("Suite::%s::Components" % (suite));
+    architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite));
     for arch in [ "source", "all" ]:
         if architectures.count(arch):
             architectures.remove(arch);