correct suite names

[dak.git] / rene

diff --git a/rene b/rene
index 3f1b9d1e98e5672d7df686bf182f97420ef9cbf6..e4f570a15b5156d9392aa42380fbde9650813f44 100755 (executable)
--- a/rene
+++ b/rene
@@ -2,7 +2,7 @@
 
 # Check for obsolete binary packages
 # 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.13 2002-06-08 00:18:02 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
@@ -60,7 +60,7 @@ def main ():
     suite = "unstable";
     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:
         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...
@@ -97,7 +97,7 @@ def main ():
                         if architectures.has_key(arch):
                             versions.append(version);
                     versions.sort(apt_pkg.VersionCompare);
-                    if versions != []:
+                    if versions:
                         latest_version = versions.pop()
                     else:
                         latest_version = None;
@@ -132,10 +132,8 @@ def main ():
         os.unlink(temp_filename);
 
     for component in components:
-        architectures = Cnf.SubTree("Suite::%s::Architectures" % (suite)).List();
+        architectures = filter(utils.real_arch, Cnf.ValueList("Suite::%s::Architectures" % (suite)));
         for architecture in architectures:
-            if [ "source", "all" ].count(architecture) != 0:
-                continue;
             filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::Root"], suite, component, architecture);
             packages = utils.open_file(filename);
             Packages = apt_pkg.ParseTagFile(packages);
@@ -165,7 +163,7 @@ SELECT s.source, s.version AS experimental, s2.version AS unstable
    AND sa2.source = s2.id AND s.source = s2.source
    AND versioncmp(s.version, s2.version) < 0""" % (suite_id));
     ql = q.getresult();
-    if ql != []:
+    if ql:
         print
         print q