X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jeri;h=4059478099cf12cf687f241b6190b9ff66df305b;hb=7373e8d22c233a23fdbb339ac6653b7b20c2638c;hp=ba7209d6cf59ac54e2f07b218a38160273ce71c9;hpb=f3adcc5ec038ffdbe4e34d9b96dca77a94cb0cf8;p=dak.git

diff --git a/jeri b/jeri
index ba7209d6..40594780 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.1 2001-11-04 20:41:50 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: jeri,v 1.6 2002-05-14 15:34: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
@@ -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":
@@ -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];
@@ -239,14 +253,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():
@@ -268,25 +282,21 @@ def parse_packages():
 def main ():
     global Cnf, projectB, Options;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     Arguments = [('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" ]:
-        Cnf["Jeri::Options::%s" % (i)] = "";
+                 ('h',"help","Jeri::Options::Help")];
+    for i in [ "quiet", "verbose", "help" ]:
+	if not Cnf.has_key("Jeri::Options::%s" % (i)):
+	    Cnf["Jeri::Options::%s" % (i)] = "";
 
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Jeri::Options")
 
     if Options["Help"]:
         usage(0);
-    if arguments == []:
+    if not arguments:
         utils.fubar("need at least one package name as an argument.");
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));