2004-11-27 James Troup <james@nocrew.org> * utils.py (re_no_epoch): s/\*/+/ as...

[dak.git] / jeri

diff --git a/jeri b/jeri
index 72b2077e6285e517480092209a7186c02db48288..49685b5dc2d69caf973d58049649610bd0431ecb 100755 (executable)
--- a/jeri
+++ b/jeri
@@ -2,7 +2,7 @@
 
 # Dependency check proposed-updates
 # Copyright (C) 2001, 2002, 2004  James Troup <james@nocrew.org>
-# $Id: jeri,v 1.13 2004-06-24 00:41:39 troup Exp $
+# $Id: jeri,v 1.14 2004-11-27 18:12:57 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
@@ -80,7 +80,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." % (utils.pp_dep(parsed_dep));
+                                print "Found %s as a real package." % (utils.pp_deps(parsed_dep));
                             unsat = 0;
                             break;
                 # As a virtual?
@@ -88,7 +88,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." % (utils.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?
@@ -96,12 +96,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." % (utils.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: " % (utils.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]);
@@ -126,7 +126,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, utils.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;