X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_archive.py;h=2d9321d68c68f1caf5e7d77799c6eece507cb739;hb=c9e12bb14c839b31d48db95406b4497bb4cdffde;hp=6b83cd17c9ca86472ba0607cdcf265d824ba671b;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/check_archive.py b/dak/check_archive.py index 6b83cd17..2d9321d6 100755 --- a/dak/check_archive.py +++ b/dak/check_archive.py @@ -1,8 +1,7 @@ #!/usr/bin/env python # Various different sanity checks -# Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup -# $Id: tea,v 1.31 2004-11-27 18:03:11 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003, 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 @@ -27,9 +26,10 @@ ################################################################################ -import commands, os, pg, stat, string, sys, time -import db_access, utils +import commands, os, pg, stat, sys, time import apt_pkg, apt_inst +from daklib import database +from daklib import utils ################################################################################ @@ -45,7 +45,7 @@ current_time = time.time() ################################################################################ def usage(exit_code=0): - print """Usage: tea MODE + print """Usage: dak check-archive MODE Run various sanity checks of the archive and/or database. -h, --help show this help and exit. @@ -80,7 +80,7 @@ def process_dir (unused, dirname, filenames): filename = filename.replace('potato-proposed-updates', 'proposed-updates') if os.path.isfile(filename) and not os.path.islink(filename) and not db_files.has_key(filename) and not excluded.has_key(filename): waste += os.stat(filename)[stat.ST_SIZE] - print filename + print "%s" % (filename) ################################################################################ @@ -88,24 +88,29 @@ def check_files(): global db_files print "Building list of database files..." - q = projectB.query("SELECT l.path, f.filename FROM files f, location l WHERE f.location = l.id") + q = projectB.query("SELECT l.path, f.filename, f.last_used FROM files f, location l WHERE f.location = l.id ORDER BY l.path, f.filename") ql = q.getresult() + print "Missing files:" db_files.clear() for i in ql: - filename = os.path.abspath(i[0] + i[1]) + filename = os.path.abspath(i[0] + i[1]) db_files[filename] = "" if os.access(filename, os.R_OK) == 0: - utils.warn("'%s' doesn't exist." % (filename)) + if i[2]: + print "(last used: %s) %s" % (i[2], filename) + else: + print "%s" % (filename) + filename = Cnf["Dir::Override"]+'override.unreferenced' if os.path.exists(filename): - file = utils.open_file(filename) - for filename in file.readlines(): + f = utils.open_file(filename) + for filename in f.readlines(): filename = filename[:-1] excluded[filename] = "" - print "Checking against existent files..." + print "Existent files not in db:" os.path.walk(Cnf["Dir::Root"]+'pool/', process_dir, None) @@ -124,11 +129,11 @@ def check_dscs(): list_filename = '%s%s_%s_source.list' % (Cnf["Dir::Lists"], suite, component) list_file = utils.open_file(list_filename) for line in list_file.readlines(): - file = line[:-1] + f = line[:-1] try: - utils.parse_changes(file, signing_rules=1) - except utils.invalid_dsc_format_exc, line: - utils.warn("syntax error in .dsc file '%s', line %s." % (file, line)) + utils.parse_changes(f, signing_rules=1) + except InvalidDscError, line: + utils.warn("syntax error in .dsc file '%s', line %s." % (f, line)) count += 1 if count: @@ -141,7 +146,7 @@ def check_override(): print suite print "-"*len(suite) print - suite_id = db_access.get_suite_id(suite) + suite_id = database.get_suite_id(suite) q = projectB.query(""" SELECT DISTINCT b.package FROM binaries b, bin_associations ba WHERE b.id = ba.bin AND ba.suite = %s AND NOT EXISTS @@ -196,15 +201,15 @@ def check_md5sums(): print "Checking file md5sums & sizes..." for i in ql: - filename = os.path.abspath(i[0] + i[1]) + filename = os.path.abspath(i[0] + i[1]) db_md5sum = i[2] db_size = int(i[3]) try: - file = utils.open_file(filename) + f = utils.open_file(filename) except: utils.warn("can't open '%s'." % (filename)) continue - md5sum = apt_pkg.md5sum(file) + md5sum = apt_pkg.md5sum(f) size = os.stat(filename)[stat.ST_SIZE] if md5sum != db_md5sum: utils.warn("**WARNING** md5sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, md5sum, db_md5sum)) @@ -233,14 +238,14 @@ def check_timestamps(): db_files.clear() count = 0 for i in ql: - filename = os.path.abspath(i[0] + i[1]) + filename = os.path.abspath(i[0] + i[1]) if os.access(filename, os.R_OK): - file = utils.open_file(filename) + f = utils.open_file(filename) current_file = filename sys.stderr.write("Processing %s.\n" % (filename)) - apt_inst.debExtract(file,Ent,"control.tar.gz") - file.seek(0) - apt_inst.debExtract(file,Ent,"data.tar.gz") + apt_inst.debExtract(f, Ent, "control.tar.gz") + f.seek(0) + apt_inst.debExtract(f, Ent, "data.tar.gz") count += 1 print "Checked %d files (out of %d)." % (count, len(db_files.keys())) @@ -265,15 +270,15 @@ def check_missing_tar_gz_in_dsc(): utils.fubar("error parsing .dsc file '%s'." % (filename)) dsc_files = utils.build_file_list(dsc, is_a_dsc=1) has_tar = 0 - for file in dsc_files.keys(): - m = utils.re_issource.match(file) + for f in dsc_files.keys(): + m = utils.re_issource.match(f) if not m: - utils.fubar("%s not recognised as source." % (file)) - type = m.group(3) - if type == "orig.tar.gz" or type == "tar.gz": + utils.fubar("%s not recognised as source." % (f)) + ftype = m.group(3) + if ftype == "orig.tar.gz" or ftype == "tar.gz": has_tar = 1 if not has_tar: - utils.warn("%s has no .tar.gz in the .dsc file." % (file)) + utils.warn("%s has no .tar.gz in the .dsc file." % (f)) count += 1 if count: @@ -345,7 +350,7 @@ def check_indices_files_exist(): for suite in [ "stable", "testing", "unstable" ]: for component in Cnf.ValueList("Suite::%s::Components" % (suite)): architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite)) - for arch in map(string.lower, architectures): + for arch in [ i.lower() for i in architectures ]: if arch == "source": validate_sources(suite, component) elif arch == "all": @@ -362,39 +367,13 @@ def check_files_not_symlinks(): print "done. (%d seconds)" % (int(time.time()-before)) q_files = q.getresult() -# locations = {} -# q = projectB.query("SELECT l.path, c.name, l.id FROM location l, component c WHERE l.component = c.id") -# for i in q.getresult(): -# path = os.path.normpath(i[0] + i[1]) -# locations[path] = (i[0], i[2]) - -# q = projectB.query("BEGIN WORK") for i in q_files: - filename = os.path.normpath(i[0] + i[1]) -# file_id = i[2] + filename = os.path.normpath(i[0] + i[1]) if os.access(filename, os.R_OK) == 0: utils.warn("%s: doesn't exist." % (filename)) else: if os.path.islink(filename): utils.warn("%s: is a symlink." % (filename)) - # You probably don't want to use the rest of this... -# print "%s: is a symlink." % (filename) -# dest = os.readlink(filename) -# if not os.path.isabs(dest): -# dest = os.path.normpath(os.path.join(os.path.dirname(filename), dest)) -# print "--> %s" % (dest) -# # Determine suitable location ID -# # [in what must be the suckiest way possible?] -# location_id = None -# for path in locations.keys(): -# if dest.find(path) == 0: -# (location, location_id) = locations[path] -# break -# if not location_id: -# utils.fubar("Can't find location for %s (%s)." % (dest, filename)) -# new_filename = dest.replace(location, "") -# q = projectB.query("UPDATE files SET filename = '%s', location = %s WHERE id = %s" % (new_filename, location_id, file_id)) -# q = projectB.query("COMMIT WORK") ################################################################################ @@ -424,27 +403,27 @@ def main (): global Cnf, projectB, db_files, waste, excluded Cnf = utils.get_conf() - Arguments = [('h',"help","Tea::Options::Help")] + Arguments = [('h',"help","Check-Archive::Options::Help")] for i in [ "help" ]: - if not Cnf.has_key("Tea::Options::%s" % (i)): - Cnf["Tea::Options::%s" % (i)] = "" + if not Cnf.has_key("Check-Archive::Options::%s" % (i)): + Cnf["Check-Archive::Options::%s" % (i)] = "" args = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv) - Options = Cnf.SubTree("Tea::Options") + Options = Cnf.SubTree("Check-Archive::Options") if Options["Help"]: - usage() + usage() if len(args) < 1: - utils.warn("tea requires at least one argument") + utils.warn("dak check-archive requires at least one argument") usage(1) elif len(args) > 1: - utils.warn("tea accepts only one argument") + utils.warn("dak check-archive accepts only one argument") usage(1) mode = args[0].lower() projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - db_access.init(Cnf, projectB) + database.init(Cnf, projectB) if mode == "md5sums": check_md5sums() @@ -474,4 +453,3 @@ def main (): if __name__ == '__main__': main() -