X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=rene;h=15d7cd0f6d6a1d83f3b5518ecf2c0ea913c2daaf;hb=080f3c9b04f77a9b873628241fbe121583d074d1;hp=b7a3eec1ade32f8252692da20e8e46ba16a18966;hpb=c1c7681bf43c58dd5cf34d1c1814a75ae594688b;p=dak.git

diff --git a/rene b/rene
index b7a3eec1..15d7cd0f 100755
--- a/rene
+++ b/rene
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Check for obsolete binary packages
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: rene,v 1.8 2001-11-04 22:28:44 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $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
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+################################################################################
+
 # "Welcome to where time stands still,
 #  No one leaves and no one will."
 #   - Sanitarium - Metallica / Master of the puppets
@@ -38,13 +40,9 @@ projectB = None;
 def main ():
     global Cnf, projectB;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
-    Arguments = [('D',"debug","Catherine::Options::Debug", "IntVal"),
-                 ('h',"help","Catherine::Options::Help"),
+    Arguments = [('h',"help","Catherine::Options::Help"),
                  ('V',"version","Catherine::Options::Version"),
                  ('l',"limit", "Catherine::Options::Limit", "HasArg"),
                  ('n',"no-action","Catherine::Options::No-Action"),
@@ -62,9 +60,9 @@ 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::RootDir"], 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...
         temp_filename = tempfile.mktemp();
         fd = os.open(temp_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700);
@@ -99,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;
@@ -134,11 +132,11 @@ def main ():
         os.unlink(temp_filename);
 
     for component in components:
-        architectures = Cnf.SubTree("Suite::%s::Architectures" % (suite)).List();
+        architectures = 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::RootDir"], suite, component, architecture);
+            filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::Root"], suite, component, architecture);
             packages = utils.open_file(filename);
             Packages = apt_pkg.ParseTagFile(packages);
             while Packages.Step():
@@ -167,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 versioncmp(s.version, s2.version) < 0""" % (suite_id));
     ql = q.getresult();
-    if ql != []:
+    if ql:
         print
         print q