X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jenna;h=a88718e07aaa009ba64d9e4a87cf495289e6e47c;hb=8e9a5d533c8458eaca33266208f6c347d66dfeef;hp=07e8ca79472024fb6b07a8613cb482af7729d35b;hpb=5fc7cefdb9b600c729ca5a82fd5b3a828f4fd370;p=dak.git

diff --git a/jenna b/jenna
index 07e8ca79..a88718e0 100755
--- a/jenna
+++ b/jenna
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Generate file list which is then fed to apt-ftparchive to generate Packages and Sources files
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: jenna,v 1.14 2001-09-27 01:22:51 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $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
@@ -217,10 +217,7 @@ def main():
     global Cnf, projectB, Logger;
     dislocated_files = {};
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     Arguments = [('a',"architecture","Jenna::Options::Architecture", "HasArg"),
                  ('c',"component","Jenna::Options::Component", "HasArg"),
@@ -228,7 +225,8 @@ def main():
                  ('s',"suite", "Jenna::Options::Suite", "HasArg")];
 
     for i in ["architecture", "component", "help", "suite" ]:
-        Cnf["Jenna::Options::%s" % (i)] = "";
+	if not Cnf.has_key("Jenna::Options::%s" % (i)):
+	    Cnf["Jenna::Options::%s" % (i)] = "";
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Jenna::Options");
@@ -254,29 +252,29 @@ 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":
                     continue
                 if architecture == "source":
                     Logger.log(["Processing dists/%s/%s/%s..." % (suite, component, architecture)]);
-                    output = utils.open_file("%s/%s_%s_%s.list" % (Cnf["Dir::ListsDir"], suite, component, architecture), "w")
+                    output = utils.open_file("%s/%s_%s_%s.list" % (Cnf["Dir::Lists"], suite, component, architecture), "w")
                     generate_src_list(suite, component, output, dislocated_files);
                     output.close();
                 else:
                     Logger.log(["Processing dists/%s/%s/binary-%s..." % (suite, component, architecture)]);
-                    output = utils.open_file("%s/%s_%s_binary-%s.list" % (Cnf["Dir::ListsDir"], suite, component, architecture), "w");
+                    output = utils.open_file("%s/%s_%s_binary-%s.list" % (Cnf["Dir::Lists"], suite, component, architecture), "w");
                     generate_bin_list(suite, component, architecture, output, "deb", dislocated_files);
                     output.close();
-                    if component == "main" and (suite == "unstable" or suite == "testing"): # FIXME: must be a cleaner way to say debian-installer is main only?
+                    if component == "main" and (suite == "unstable" or suite == "testing") and Cnf.has_key("Section::debian-installer"): # FIXME: must be a cleaner way to say debian-installer is main only?
                         Logger.log(["Processing dists/%s/%s/debian-installer/binary-%s..." % (suite,component, architecture)]);
-                        output = utils.open_file("%s/%s_%s_debian-installer_binary-%s.list" % (Cnf["Dir::ListsDir"], suite, component, architecture), "w");
+                        output = utils.open_file("%s/%s_%s_debian-installer_binary-%s.list" % (Cnf["Dir::Lists"], suite, component, architecture), "w");
                         generate_bin_list(suite, component, architecture, output, "udeb", dislocated_files);
                         output.close();
     Logger.close();