提交 74e8cb55 编写于 作者: J James Troup

Suite::%s::{Architectures,Components}, OverrideType, Section,...

Suite::%s::{Architectures,Components}, OverrideType, Section, Location::%s::Suites and Urgency::Valid become ValueLists not Lists.  shorter if list not null test
上级 30b41506
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Check for obsolete binary packages # Check for obsolete binary packages
# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org> # Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
# $Id: rene,v 1.11 2002-05-08 11:13:02 troup Exp $ # $Id: rene,v 1.12 2002-05-14 15:33:32 troup Exp $
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
...@@ -60,7 +60,7 @@ def main (): ...@@ -60,7 +60,7 @@ def main ():
suite = "unstable"; suite = "unstable";
suite_id = db_access.get_suite_id(suite); suite_id = db_access.get_suite_id(suite);
components = Cnf.SubTree("Suite::%s::Components" % (suite)).List(); components = Cnf.ValueList("Suite::%s::Components" % (suite));
for component in components: for component in components:
filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suite, component); filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suite, component);
# apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance...
...@@ -97,7 +97,7 @@ def main (): ...@@ -97,7 +97,7 @@ def main ():
if architectures.has_key(arch): if architectures.has_key(arch):
versions.append(version); versions.append(version);
versions.sort(apt_pkg.VersionCompare); versions.sort(apt_pkg.VersionCompare);
if versions != []: if versions:
latest_version = versions.pop() latest_version = versions.pop()
else: else:
latest_version = None; latest_version = None;
...@@ -132,7 +132,7 @@ def main (): ...@@ -132,7 +132,7 @@ def main ():
os.unlink(temp_filename); os.unlink(temp_filename);
for component in components: for component in components:
architectures = Cnf.SubTree("Suite::%s::Architectures" % (suite)).List(); architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite));
for architecture in architectures: for architecture in architectures:
if [ "source", "all" ].count(architecture) != 0: if [ "source", "all" ].count(architecture) != 0:
continue; continue;
...@@ -165,7 +165,7 @@ SELECT s.source, s.version AS experimental, s2.version AS unstable ...@@ -165,7 +165,7 @@ SELECT s.source, s.version AS experimental, s2.version AS unstable
AND sa2.source = s2.id AND s.source = s2.source AND sa2.source = s2.id AND s.source = s2.source
AND versioncmp(s.version, s2.version) < 0""" % (suite_id)); AND versioncmp(s.version, s2.version) < 0""" % (suite_id));
ql = q.getresult(); ql = q.getresult();
if ql != []: if ql:
print print
print q print q
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册