X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=rene;h=3f1b9d1e98e5672d7df686bf182f97420ef9cbf6;hb=5b1244957793ec103b80d2c5516e1744324806ea;hp=04d89a5cb1cb623fbe47679a732b599859ee391f;hpb=372e4b10399b8dc6712d99b014e0166b2bd6a638;p=dak.git

diff --git a/rene b/rene
index 04d89a5c..3f1b9d1e 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.7 2001-07-25 15:51:15 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: rene,v 1.11 2002-05-08 11:13: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
@@ -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"),
@@ -64,7 +62,7 @@ def main ():
 
     components = Cnf.SubTree("Suite::%s::Components" % (suite)).List();
     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);
@@ -73,7 +71,7 @@ def main ():
         if (result != 0):
             sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output));
             sys.exit(result);
-        sources = utils.open_file(temp_filename, 'r');
+        sources = utils.open_file(temp_filename);
         Sources = apt_pkg.ParseTagFile(sources);
         while Sources.Step():
             source = Sources.Section.Find('Package');
@@ -89,7 +87,7 @@ def main ():
                     binary = string.strip(binary);
                     q = projectB.query("SELECT a.arch_string, b.version FROM binaries b, bin_associations ba, architecture a WHERE ba.suite = %s AND ba.bin = b.id AND b.architecture = a.id AND b.package = '%s'" % (suite_id, binary));
                     ql = q.getresult();
-                    if ql == []:
+                    if not ql:
                         utils.warn("%s lists %s as a binary, but it doesn't seem to exist in %s?" % (source, binary, suite));
                     # Loop around twice; first to get the latest 'valid' version
                     versions = [];
@@ -113,11 +111,11 @@ def main ():
                                 print "** mwaap, mwapp!  Ignore me **";
                                 continue;
                             if apt_pkg.VersionCompare(latest_version, version) != -1:
-                                print "- out of date.", 
+                                print "- out of date.",
                             else:
                                 print "- current.",
                             print "[%s vs %s (%s)]" % (latest_version, version, arch);
-            
+
             # Check for duplicated packages and build indices for checking "no source" later
             source_index = component + '/' + source;
             if src_pkgs.has_key(source):
@@ -138,8 +136,8 @@ def main ():
         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);
-            packages = utils.open_file(filename, 'r');
+            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():
                 package = Packages.Section.Find('Package');
@@ -161,10 +159,10 @@ def main ():
 
     suite_id = db_access.get_suite_id("unstable");
     q = projectB.query("""
-SELECT s.source, s.version AS experimental, s2.version AS unstable 
-  FROM src_associations sa, source s, source s2, src_associations sa2 
-  WHERE sa.suite = 1 AND sa2.suite = %d AND sa.source = s.id 
-   AND sa2.source = s2.id AND s.source = s2.source 
+SELECT s.source, s.version AS experimental, s2.version AS unstable
+  FROM src_associations sa, source s, source s2, src_associations sa2
+  WHERE sa.suite = 1 AND sa2.suite = %d AND sa.source = s.id
+   AND sa2.source = s2.id AND s.source = s2.source
    AND versioncmp(s.version, s2.version) < 0""" % (suite_id));
     ql = q.getresult();
     if ql != []: