X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_proposed_updates.py;h=eb488330e951d341a302f861002b1ce0e62eb406;hb=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=d935399efe50aac8e9948893e4373be01fd6b9c3;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/check_proposed_updates.py b/dak/check_proposed_updates.py index d935399e..eb488330 100755 --- a/dak/check_proposed_updates.py +++ b/dak/check_proposed_updates.py @@ -1,8 +1,7 @@ #!/usr/bin/env python -# Dependency check proposed-updates -# Copyright (C) 2001, 2002, 2004 James Troup -# $Id: jeri,v 1.15 2005-02-08 22:43:45 troup Exp $ +""" Dependency check proposed-updates """ +# Copyright (C) 2001, 2002, 2004, 2006 James Troup # 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 @@ -21,22 +20,24 @@ ################################################################################ # | > 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> ################################################################################ -import pg, sys, os -import utils, db_access +import sys, os import apt_pkg, apt_inst +from daklib.dbconn import * +from daklib.config import Config +from daklib import utils +from daklib.regexes import re_no_epoch + ################################################################################ -Cnf = None -projectB = None Options = None stable = {} stable_virtual = {} @@ -45,7 +46,7 @@ architectures = None ################################################################################ def usage (exit_code=0): - print """Usage: jeri [OPTION] [...] + print """Usage: dak check-proposed-updates [OPTION] [...] (Very) Basic dependency checking for proposed-updates. -q, --quiet be quieter about what is being done @@ -91,7 +92,7 @@ def check_dep (depends, dep_type, check_archs, filename, files): unsat = 0 break # As part of the same .changes? - epochless_version = utils.re_no_epoch.sub('', version) + epochless_version = re_no_epoch.sub('', version) dep_filename = "%s_%s_%s.deb" % (dep, epochless_version, arch) if files.has_key(dep_filename): if Options["debug"]: @@ -172,9 +173,14 @@ def pass_fail (filename, result): ################################################################################ def check_changes (filename): + cnf = Config() + try: changes = utils.parse_changes(filename) files = utils.build_file_list(changes) + except ChangesUnicodeError: + utils.warn("Improperly encoded changes file, not utf-8") + return except: utils.warn("Error parsing changes file '%s'" % (filename)) return @@ -183,16 +189,16 @@ def check_changes (filename): # Move to the pool directory cwd = os.getcwd() - file = files.keys()[0] - pool_dir = Cnf["Dir::Pool"] + '/' + utils.poolify(changes["source"], files[file]["component"]) + f = files.keys()[0] + pool_dir = cnf["Dir::Pool"] + '/' + utils.poolify(changes["source"], files[f]["component"]) os.chdir(pool_dir) changes_result = 0 - for file in files.keys(): - if file.endswith(".deb"): - result = check_package(file, files) + for f in files.keys(): + if f.endswith(".deb"): + result = check_package(f, files) if Options["verbose"]: - pass_fail(file, result) + pass_fail(f, result) changes_result += result pass_fail (filename, changes_result) @@ -210,12 +216,14 @@ def check_deb (filename): ################################################################################ def check_joey (filename): - file = utils.open_file(filename) + cnf = Config() + + f = utils.open_file(filename) cwd = os.getcwd() - os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"])) + os.chdir("%s/dists/proposed-updates" % (cnf["Dir::Root"])) - for line in file.readlines(): + for line in f.readlines(): line = line.rstrip() if line.find('install') != -1: split_line = line.split() @@ -228,7 +236,7 @@ def check_joey (filename): if Options["debug"]: print "Processing %s..." % (changes_filename) check_changes(changes_filename) - file.close() + f.close() os.chdir(cwd) @@ -237,14 +245,16 @@ def check_joey (filename): def parse_packages(): global stable, stable_virtual, architectures + cnf = Config() + # Parse the Packages files (since it's a sub-second operation on auric) suite = "stable" stable = {} - components = Cnf.ValueList("Suite::%s::Components" % (suite)) - architectures = filter(utils.real_arch, Cnf.ValueList("Suite::%s::Architectures" % (suite))) + components = cnf.ValueList("Suite::%s::Components" % (suite)) + architectures = [ a.arch_string for a in get_suite_architectures(suite, skipsrc=True, skipall=True) ] for component in components: for architecture in architectures: - filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::Root"], 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(): @@ -265,42 +275,41 @@ def parse_packages(): ################################################################################ def main (): - global Cnf, projectB, Options + global Options - Cnf = utils.get_conf() + cnf = Config() - Arguments = [('d', "debug", "Jeri::Options::Debug"), - ('q',"quiet","Jeri::Options::Quiet"), - ('v',"verbose","Jeri::Options::Verbose"), - ('h',"help","Jeri::Options::Help")] + Arguments = [('d', "debug", "Check-Proposed-Updates::Options::Debug"), + ('q',"quiet","Check-Proposed-Updates::Options::Quiet"), + ('v',"verbose","Check-Proposed-Updates::Options::Verbose"), + ('h',"help","Check-Proposed-Updates::Options::Help")] for i in [ "debug", "quiet", "verbose", "help" ]: - if not Cnf.has_key("Jeri::Options::%s" % (i)): - Cnf["Jeri::Options::%s" % (i)] = "" + if not cnf.has_key("Check-Proposed-Updates::Options::%s" % (i)): + cnf["Check-Proposed-Updates::Options::%s" % (i)] = "" - arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Jeri::Options") + arguments = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Check-Proposed-Updates::Options") if Options["Help"]: usage(0) 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"])) - db_access.init(Cnf, projectB) + DBConn() print "Parsing packages files...", parse_packages() print "done." - for file in arguments: - if file.endswith(".changes"): - check_changes(file) - elif file.endswith(".deb"): - check_deb(file) - elif file.endswith(".joey"): - check_joey(file) + for f in arguments: + if f.endswith(".changes"): + check_changes(f) + elif f.endswith(".deb"): + check_deb(f) + elif f.endswith(".joey"): + check_joey(f) else: - utils.fubar("Unrecognised file type: '%s'." % (file)) + utils.fubar("Unrecognised file type: '%s'." % (f)) #######################################################################################