X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jeri;h=2542f43491079d71946d29150ef197e78fd83fdd;hb=5b7e16de8a94b2600336cc8954fbb995e5a0b3bf;hp=bcbb5150f402dca31be2971a6b01b5ada0010c38;hpb=5279af26b05d602c20f2e54b4674ad342801660c;p=dak.git

diff --git a/jeri b/jeri
index bcbb5150..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.8 2002-05-23 12:36:25 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
@@ -230,15 +230,15 @@ 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);
@@ -255,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);