#!/usr/bin/env python
# Dependency check proposed-updates
-# Copyright (C) 2001, 2002 James Troup <james@nocrew.org>
-# $Id: jeri,v 1.5 2002-05-08 11:13:02 troup Exp $
+# Copyright (C) 2001, 2002, 2004 James Troup <james@nocrew.org>
+# $Id: jeri,v 1.13 2004-06-24 00:41:39 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
################################################################################
-import pg, sys, os, string
+import pg, sys, os;
import utils, db_access
import apt_pkg, apt_inst;
def usage (exit_code=0):
print """Usage: jeri [OPTION] <CHANGES FILE | DEB FILE | ADMIN FILE>[...]
-Remove obsolete changes files from proposed-updates.
+(Very) Basic dependency checking for proposed-updates.
-q, --quiet be quieter about what is being done
-v, --verbose be more verbose about what is being done
################################################################################
-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 string.join(pp_deps, " |");
-
-################################################################################
-
def d_test (dict, key, positive, negative):
if not dict:
return negative;
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_dep(parsed_dep));
unsat = 0;
break;
# As a virtual?
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_dep(parsed_dep));
unsat = 0;
break;
# As part of the same .changes?
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_dep(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_dep(parsed_dep))
if stable.has_key(dep):
if stable[dep].has_key(arch):
- error = error + "%s:%s:%s" % (dep, arch, stable[dep][arch]);
+ error += "%s:%s:%s" % (dep, arch, stable[dep][arch]);
else:
- error = error + "%s:-:-" % (dep);
+ error += "%s:-:-" % (dep);
else:
- error = error + "-:-:-";
- error = error + ", Virtual: ";
+ error += "-:-:-";
+ error += ", Virtual: ";
if stable_virtual.has_key(dep):
if stable_virtual[dep].has_key(arch):
- error = error + "%s:%s" % (dep, arch);
+ error += "%s:%s" % (dep, arch);
else:
- error = error + "%s:-";
+ error += "%s:-";
else:
- error = error + "-:-";
- error = error + ", Upload: ";
+ error += "-:-";
+ error += ", Upload: ";
if files.has_key(dep_filename):
- error = error + "yes";
+ error += "yes";
else:
- error = error + "no";
- error = error + "]";
+ error += "no";
+ error += "]";
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_dep(parsed_dep), dep_type));
for error in unsat:
sys.stderr.write(" %s\n" % (error));
pkg_unsat = 1;
pkg_unsat = 0;
if Pre_Depends:
- pkg_unsat = pkg_unsat + check_dep(Pre_Depends, "pre-dependency", check_archs, base_file, files);
+ pkg_unsat += check_dep(Pre_Depends, "pre-dependency", check_archs, base_file, files);
if Depends:
- pkg_unsat = pkg_unsat + check_dep(Depends, "dependency", check_archs, base_file, files);
+ pkg_unsat += check_dep(Depends, "dependency", check_archs, base_file, files);
#if Recommends:
- #pkg_unsat = pkg_unsat + check_dep(Recommends, "recommendation", check_archs, base_file, files);
+ #pkg_unsat += check_dep(Recommends, "recommendation", check_archs, base_file, files);
return pkg_unsat;
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;
changes_result = 0;
for file in files.keys():
- if file[-4:] == ".deb":
+ if file.endswith(".deb"):
result = check_package(file, files);
if Options["verbose"]:
pass_fail(file, result);
- changes_result = changes_result + result;
+ changes_result += result;
pass_fail (filename, changes_result);
os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"]));
for line in file.readlines():
- line = line[:-1];
- if string.find(line, 'install') != -1:
- split_line = string.split(line);
+ line = line.rstrip();
+ if line.find('install') != -1:
+ split_line = line.split();
+ 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 len(split_line) != 2:
- utils.fubar("Parse error (more than 2 elements): %s" % (line));
if Options["debug"]:
print "Processing %s..." % (changes_filename);
check_changes(changes_filename);
+ file.close();
os.chdir(cwd);
# 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();
- for arch in [ "source", "all" ]:
- if architectures.count(arch):
- architectures.remove(arch);
+ components = Cnf.ValueList("Suite::%s::Components" % (suite));
+ architectures = filter(utils.real_arch, Cnf.ValueList("Suite::%s::Architectures" % (suite)));
for component in components:
for architecture in architectures:
filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::Root"], suite, component, architecture);
stable[package] = {};
stable[package][architecture] = version;
if provides:
- for virtual_pkg in string.split(provides,","):
- virtual_pkg = string.strip(virtual_pkg);
+ for virtual_pkg in provides.split(","):
+ virtual_pkg = virtual_pkg.strip();
if not stable_virtual.has_key(virtual_pkg):
stable_virtual[virtual_pkg] = {};
stable_virtual[virtual_pkg][architecture] = "NA";
+ packages.close()
################################################################################
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"),
('h',"help","Jeri::Options::Help")];
- for i in [ "quiet", "verbose", "help" ]:
+ for i in [ "debug", "quiet", "verbose", "help" ]:
if not Cnf.has_key("Jeri::Options::%s" % (i)):
Cnf["Jeri::Options::%s" % (i)] = "";
print "done.";
for file in arguments:
- if file[-8:] == ".changes":
+ if file.endswith(".changes"):
check_changes(file);
- elif file[-4:] == ".deb":
+ elif file.endswith(".deb"):
check_deb(file);
- elif file[-5:] == ".joey":
+ elif file.endswith(".joey"):
check_joey(file);
else:
utils.fubar("Unrecognised file type: '%s'." % (file));