From 9874d8cdf8943e6420fe04bc6c57ea74cc5df81a Mon Sep 17 00:00:00 2001 From: James Troup Date: Sat, 8 Jun 2002 00:17:59 +0000 Subject: [PATCH] cleanup patch from tbm + real_arch filter --- jeri | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 -# $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); -- GitLab