X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jeri;h=bcbb5150f402dca31be2971a6b01b5ada0010c38;hb=b3df411d2abd01de73870b3b456fb56c6e6446d9;hp=ce69162d2ed645c4c8ad9b6af6e5efdd62f9d9d7;hpb=8ecf66b7d933929ca5f504a32fb54542b0b87b71;p=dak.git

diff --git a/jeri b/jeri
index ce69162d..bcbb5150 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.8 2002-05-23 12:36:25 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
@@ -187,8 +187,8 @@ def pass_fail (filename, result):
 
 def check_changes (filename):
     try:
-        changes = utils.parse_changes(filename, 0)
-        files = utils.build_file_list(changes, "");
+        changes = utils.parse_changes(filename);
+        files = utils.build_file_list(changes);
     except:
         utils.warn("Error parsing changes file '%s'" % (filename));
         return;
@@ -242,6 +242,7 @@ def check_joey (filename):
             if Options["debug"]:
                 print "Processing %s..." % (changes_filename);
             check_changes(changes_filename);
+    file.close();
 
     os.chdir(cwd);
 
@@ -253,8 +254,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);
@@ -276,6 +277,7 @@ def parse_packages():
                         if not stable_virtual.has_key(virtual_pkg):
                             stable_virtual[virtual_pkg] = {};
                         stable_virtual[virtual_pkg][architecture] = "NA";
+            packages.close()
 
 ################################################################################
 
@@ -284,10 +286,11 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    Arguments = [('q',"quiet","Jeri::Options::Quiet"),
+    Arguments = [('d', "debug", "Jeri::Options::Debug"),
+                 ('q',"quiet","Jeri::Options::Quiet"),
                  ('v',"verbose","Jeri::Options::Verbose"),
                  ('h',"help","Jeri::Options::Help")];
-    for i in [ "quiet", "verbose", "help" ]:
+    for i in [ "debug", "quiet", "verbose", "help" ]:
 	if not Cnf.has_key("Jeri::Options::%s" % (i)):
 	    Cnf["Jeri::Options::%s" % (i)] = "";