X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jeri;h=bcbb5150f402dca31be2971a6b01b5ada0010c38;hb=2dc9f86581428e698e834087faa4795a39fcf154;hp=ea813541d3fb868701fe987589d962107948657d;hpb=2f5e692bfbbb6f8146f50d944f7fcc169a95a0a3;p=dak.git

diff --git a/jeri b/jeri
index ea813541..bcbb5150 100755
--- a/jeri
+++ b/jeri
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Dependency check proposed-updates
-# Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: jeri,v 1.3 2001-11-18 19:57:58 rmurray Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: jeri,v 1.8 2002-05-23 12:36:25 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
@@ -38,12 +38,26 @@ import apt_pkg, apt_inst;
 
 Cnf = None;
 projectB = None;
+Options = None;
 stable = {};
 stable_virtual = {};
 architectures = None;
 
 ################################################################################
 
+def usage (exit_code=0):
+    print """Usage: jeri [OPTION] <CHANGES FILE | DEB FILE | ADMIN FILE>[...]
+Remove obsolete changes files from proposed-updates.
+
+  -q, --quiet                be quieter about what is being done
+  -v, --verbose              be more verbose about what is being done
+  -h, --help                 show this help and exit
+
+Need either changes files, deb files or an admin.txt file with a '.joey' suffix."""
+    sys.exit(exit_code)
+
+################################################################################
+
 def pp_dep (deps):
     pp_deps = [];
     for atom in deps:
@@ -140,7 +154,7 @@ def check_package(filename, files):
         return 1;
     Depends = control.Find("Depends");
     Pre_Depends = control.Find("Pre-Depends");
-    Recommends = control.Find("Recommends");
+    #Recommends = control.Find("Recommends");
     pkg_arch = control.Find("Architecture");
     base_file = os.path.basename(filename);
     if pkg_arch == "all":
@@ -173,8 +187,8 @@ def pass_fail (filename, result):
 
 def check_changes (filename):
     try:
-        changes = utils.parse_changes(filename, 0)
-        files = utils.build_file_list(changes, "");
+        changes = utils.parse_changes(filename);
+        files = utils.build_file_list(changes);
     except:
         utils.warn("Error parsing changes file '%s'" % (filename));
         return;
@@ -184,7 +198,7 @@ def check_changes (filename):
     # Move to the pool directory
     cwd = os.getcwd();
     file = files.keys()[0];
-    pool_dir = Cnf["Dir::PoolDir"] + '/' + utils.poolify(changes["source"], files[file]["component"]);
+    pool_dir = Cnf["Dir::Pool"] + '/' + utils.poolify(changes["source"], files[file]["component"]);
     os.chdir(pool_dir);
 
     changes_result = 0;
@@ -213,7 +227,7 @@ def check_joey (filename):
     file = utils.open_file(filename);
 
     cwd = os.getcwd();
-    os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::RootDir"]));
+    os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"]));
 
     for line in file.readlines():
         line = line[:-1];
@@ -228,6 +242,7 @@ def check_joey (filename):
             if Options["debug"]:
                 print "Processing %s..." % (changes_filename);
             check_changes(changes_filename);
+    file.close();
 
     os.chdir(cwd);
 
@@ -239,14 +254,14 @@ def parse_packages():
     # Parse the Packages files (since it's a sub-second operation on auric)
     suite = "stable";
     stable = {};
-    components = Cnf.SubTree("Suite::%s::Components" % (suite)).List();
-    architectures = Cnf.SubTree("Suite::%s::Architectures" % (suite)).List();
+    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);
     for component in components:
         for architecture in architectures:
-            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, 'r');
             Packages = apt_pkg.ParseTagFile(packages);
             while Packages.Step():
@@ -262,6 +277,7 @@ def parse_packages():
                         if not stable_virtual.has_key(virtual_pkg):
                             stable_virtual[virtual_pkg] = {};
                         stable_virtual[virtual_pkg][architecture] = "NA";
+            packages.close()
 
 ################################################################################
 
@@ -270,12 +286,11 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    Arguments = [('q',"quiet","Jeri::Options::Quiet"),
+    Arguments = [('d', "debug", "Jeri::Options::Debug"),
+                 ('q',"quiet","Jeri::Options::Quiet"),
                  ('v',"verbose","Jeri::Options::Verbose"),
-                 ('D',"debug","Jeri::Options::Debug"),
-                 ('h',"help","Jeri::Options::Help"),
-                 ('V',"version","Jeri::Options::Version")];
-    for i in [ "quiet", "verbose", "help", "debug" ]:
+                 ('h',"help","Jeri::Options::Help")];
+    for i in [ "debug", "quiet", "verbose", "help" ]:
 	if not Cnf.has_key("Jeri::Options::%s" % (i)):
 	    Cnf["Jeri::Options::%s" % (i)] = "";