Add new top level directories

[dak.git] / jeri

diff --git a/jeri b/jeri
index 6c7294f56fcaab30f3ebd5d8282bbc55e9896f34..91f51930dc9a9e606ea11bc4c692fa7b7ab3d1d6 100755 (executable)
--- a/jeri
+++ b/jeri
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Dependency check proposed-updates
-# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: jeri,v 1.11 2003-01-02 18:13:03 troup Exp $
+# Copyright (C) 2001, 2002, 2004  James Troup <james@nocrew.org>
+# $Id: jeri,v 1.15 2005-02-08 22:43:45 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
@@ -20,13 +20,12 @@
 
 ################################################################################
 
-# <aj> ARRRGGGHHH
-# <aj> what's wrong with me!?!?!?
-# <aj> i was just nice to some mormon doorknockers!!!
-# <Omnic> AJ?!?!
-# <aj> i know!!!!!
-# <Omnic> I'm gonna have to kick your ass when you come over
-# <Culus> aj: GET THE HELL OUT OF THE CABAL! :P
+# | > amd64 is more mature than even some released architectures
+# |  
+# | This might be true of the architecture, unfortunately it seems to be the
+# | exact opposite for most of the people involved with it.
+# 
+# <1089213290.24029.6.camel@descent.netsplit.com>
 
 ################################################################################
 
@@ -58,19 +57,6 @@ Need either changes files, deb files or an admin.txt file with a '.joey' suffix.
 
 ################################################################################
 
-def pp_dep (deps):
-    pp_deps = [];
-    for atom in deps:
-        (pkg, version, constraint) = atom;
-        if constraint:
-            pp_dep = "%s (%s %s)" % (pkg, constraint, version);
-        else:
-            pp_dep = pkg;
-        pp_deps.append(pp_dep);
-    return " |".join(pp_deps);
-
-################################################################################
-
 def d_test (dict, key, positive, negative):
     if not dict:
         return negative;
@@ -93,7 +79,7 @@ def check_dep (depends, dep_type, check_archs, filename, files):
                     if stable[dep].has_key(arch):
                         if apt_pkg.CheckDep(stable[dep][arch], constraint, version):
                             if Options["debug"]:
-                                print "Found %s as a real package." % (pp_dep(parsed_dep));
+                                print "Found %s as a real package." % (utils.pp_deps(parsed_dep));
                             unsat = 0;
                             break;
                 # As a virtual?
@@ -101,7 +87,7 @@ def check_dep (depends, dep_type, check_archs, filename, files):
                     if stable_virtual[dep].has_key(arch):
                         if not constraint and not version:
                             if Options["debug"]:
-                                print "Found %s as a virtual package." % (pp_dep(parsed_dep));
+                                print "Found %s as a virtual package." % (utils.pp_deps(parsed_dep));
                             unsat = 0;
                             break;
                 # As part of the same .changes?
@@ -109,12 +95,12 @@ def check_dep (depends, dep_type, check_archs, filename, files):
                 dep_filename = "%s_%s_%s.deb" % (dep, epochless_version, arch);
                 if files.has_key(dep_filename):
                     if Options["debug"]:
-                        print "Found %s in the same upload." % (pp_dep(parsed_dep));
+                        print "Found %s in the same upload." % (utils.pp_deps(parsed_dep));
                     unsat = 0;
                     break;
                 # Not found...
                 # [FIXME: must be a better way ... ]
-                error = "%s not found. [Real: " % (pp_dep(parsed_dep))
+                error = "%s not found. [Real: " % (utils.pp_deps(parsed_dep))
                 if stable.has_key(dep):
                     if stable[dep].has_key(arch):
                         error += "%s:%s:%s" % (dep, arch, stable[dep][arch]);
@@ -139,7 +125,7 @@ def check_dep (depends, dep_type, check_archs, filename, files):
                 unsat.append(error);
 
             if unsat:
-                sys.stderr.write("MWAAP! %s: '%s' %s can not be satisifed:\n" % (filename, pp_dep(parsed_dep), dep_type));
+                sys.stderr.write("MWAAP! %s: '%s' %s can not be satisifed:\n" % (filename, utils.pp_deps(parsed_dep), dep_type));
                 for error in unsat:
                     sys.stderr.write("  %s\n" % (error));
                 pkg_unsat = 1;
@@ -236,7 +222,7 @@ def check_joey (filename):
             if len(split_line) != 2:
                 utils.fubar("Parse error (not exactly 2 elements): %s" % (line));
             install_type = split_line[0];
-            if [ "install", "install-u", "sync-install" ].count(install_type) == 0:
+            if install_type not in [ "install", "install-u", "sync-install" ]:
                 utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line));
             changes_filename = split_line[1]
             if Options["debug"]: