X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jeri;h=2542f43491079d71946d29150ef197e78fd83fdd;hb=777e75e96ebc6651f77c67fddade7e8d0bc5d592;hp=4059478099cf12cf687f241b6190b9ff66df305b;hpb=cd3b031e17f5d17099ffefee5322928b9544fa32;p=dak.git

diff --git a/jeri b/jeri
index 40594780..2542f434 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.6 2002-05-14 15:34:02 troup Exp $
+# $Id: jeri,v 1.9 2002-06-08 00:17:59 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;
@@ -230,18 +230,19 @@ def check_joey (filename):
     os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"]));
 
     for line in file.readlines():
-        line = line[:-1];
+        line = string.rstrip(line);
         if string.find(line, 'install') != -1:
             split_line = string.split(line);
+            if len(split_line) != 2:
+                utils.fubar("Parse error (not exactly 2 elements): %s" % (line));
             install_type = split_line[0];
             if [ "install", "install-u", "sync-install" ].count(install_type) == 0:
                 utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line));
             changes_filename = split_line[1]
-            if len(split_line) != 2:
-                utils.fubar("Parse error (more than 2 elements): %s" % (line));
             if Options["debug"]:
                 print "Processing %s..." % (changes_filename);
             check_changes(changes_filename);
+    file.close();
 
     os.chdir(cwd);
 
@@ -254,10 +255,7 @@ def parse_packages():
     suite = "stable";
     stable = {};
     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);
+    architectures = filter(utils.real_arch, Cnf.ValueList("Suite::%s::Architectures" % (suite)));
     for component in components:
         for architecture in architectures:
             filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::Root"], suite, component, architecture);
@@ -276,6 +274,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 +283,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)] = "";