X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jeri;h=4059478099cf12cf687f241b6190b9ff66df305b;hb=7373e8d22c233a23fdbb339ac6653b7b20c2638c;hp=f8b97c28421ef016a968ed7f75303cc69a7a1aab;hpb=240185ce8d1003ad7a1a15817d1e0c2ee55675f3;p=dak.git

diff --git a/jeri b/jeri
index f8b97c28..40594780 100755
--- a/jeri
+++ b/jeri
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Dependency check proposed-updates
-# Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: jeri,v 1.4 2002-02-12 22:12:44 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $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
@@ -198,7 +198,7 @@ def check_changes (filename):
     # Move to the pool directory
     cwd = os.getcwd();
     file = files.keys()[0];
-    pool_dir = Cnf["Dir::PoolDir"] + '/' + utils.poolify(changes["source"], files[file]["component"]);
+    pool_dir = Cnf["Dir::Pool"] + '/' + utils.poolify(changes["source"], files[file]["component"]);
     os.chdir(pool_dir);
 
     changes_result = 0;
@@ -227,7 +227,7 @@ def check_joey (filename):
     file = utils.open_file(filename);
 
     cwd = os.getcwd();
-    os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::RootDir"]));
+    os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"]));
 
     for line in file.readlines():
         line = line[:-1];
@@ -253,14 +253,14 @@ 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);
     for component in components:
         for architecture in architectures:
-            filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::RootDir"], suite, component, architecture);
+            filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::Root"], suite, component, architecture);
             packages = utils.open_file(filename, 'r');
             Packages = apt_pkg.ParseTagFile(packages);
             while Packages.Step():