X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tea;h=228fd81ec896427c3b2004b45a17aa8a3b97b745;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=7a0b4c461a56fd78205914e53d5499461a65124c;hpb=d6dd1d07afbec29f2e2a79a27ea147f9c19574fc;p=dak.git diff --git a/tea b/tea index 7a0b4c46..228fd81e 100755 --- a/tea +++ b/tea @@ -1,8 +1,8 @@ #!/usr/bin/env python # Various different sanity checks -# Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $Id: tea,v 1.24 2003-09-24 00:13:46 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup +# $Id: tea,v 1.31 2004-11-27 18:03:11 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 @@ -27,7 +27,7 @@ ################################################################################ -import commands, os, pg, stat, string, sys, tempfile, time; +import commands, os, pg, stat, string, sys, time; import db_access, utils; import apt_pkg, apt_inst; @@ -61,6 +61,7 @@ The following MODEs are available: tar-gz-in-dsc - ensure each .dsc lists a .tar.gz file validate-indices - ensure files mentioned in Packages & Sources exist files-not-symlinks - check files in the database aren't symlinks + validate-builddeps - validate build-dependencies of .dsc files in the archive """ sys.exit(exit_code) @@ -97,14 +98,16 @@ def check_files(): if os.access(filename, os.R_OK) == 0: utils.warn("'%s' doesn't exist." % (filename)); - file = utils.open_file(Cnf["Dir::Override"]+'override.unreferenced'); - for filename in file.readlines(): - filename = filename[:-1]; - excluded[filename] = ""; + filename = Cnf["Dir::Override"]+'override.unreferenced'; + if os.path.exists(filename): + file = utils.open_file(filename); + for filename in file.readlines(): + filename = filename[:-1]; + excluded[filename] = ""; print "Checking against existent files..."; - os.path.walk(Cnf["Dir::Root"]+'dists/', process_dir, None); + os.path.walk(Cnf["Dir::Root"]+'pool/', process_dir, None); print print "%s wasted..." % (utils.size_type(waste)); @@ -123,7 +126,7 @@ def check_dscs(): for line in list_file.readlines(): file = line[:-1]; try: - utils.parse_changes(file, dsc_whitespace_rules=1); + 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)); count += 1; @@ -136,7 +139,7 @@ def check_dscs(): def check_override(): for suite in [ "stable", "unstable" ]: print suite - print "-------------" + print "-"*len(suite) print suite_id = db_access.get_suite_id(suite); q = projectB.query(""" @@ -283,9 +286,7 @@ def validate_sources(suite, component): filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suite, component); print "Processing %s..." % (filename); # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - temp_filename = tempfile.mktemp(); - fd = os.open(temp_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700); - os.close(fd); + temp_filename = utils.temp_filename(); (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename)); if (result != 0): sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output)); @@ -297,8 +298,7 @@ def validate_sources(suite, component): directory = Sources.Section.Find('Directory'); files = Sources.Section.Find('Files'); for i in files.split('\n'): - s = i.split(); - (md5, size, name) = s; + (md5, size, name) = i.split(); filename = "%s/%s/%s" % (Cnf["Dir::Root"], directory, name); if not os.path.exists(filename): if directory.find("potato") == -1: @@ -315,21 +315,29 @@ def validate_sources(suite, component): src = utils.clean_symlink(pool_filename, filename, Cnf["Dir::Root"]); print "Symlinking: %s -> %s" % (filename, src); #os.symlink(src, filename); + sources.close(); os.unlink(temp_filename); ######################################## def validate_packages(suite, component, architecture): - filename = "%s/dists/%s/%s/binary-%s/Packages" \ + filename = "%s/dists/%s/%s/binary-%s/Packages.gz" \ % (Cnf["Dir::Root"], suite, component, architecture); print "Processing %s..." % (filename); - packages = utils.open_file(filename); + # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... + temp_filename = utils.temp_filename(); + (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename)); + if (result != 0): + sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output)); + sys.exit(result); + packages = utils.open_file(temp_filename); Packages = apt_pkg.ParseTagFile(packages); while Packages.Step(): filename = "%s/%s" % (Cnf["Dir::Root"], Packages.Section.Find('Filename')); if not os.path.exists(filename): print "W: %s missing." % (filename); packages.close(); + os.unlink(temp_filename); ######################################## @@ -363,7 +371,7 @@ def check_files_not_symlinks(): # q = projectB.query("BEGIN WORK"); for i in q_files: filename = os.path.normpath(i[0] + i[1]); - file_id = i[2]; +# file_id = i[2]; if os.access(filename, os.R_OK) == 0: utils.warn("%s: doesn't exist." % (filename)); else: @@ -390,6 +398,28 @@ def check_files_not_symlinks(): ################################################################################ +def chk_bd_process_dir (unused, dirname, filenames): + for name in filenames: + if not name.endswith(".dsc"): + continue; + filename = os.path.abspath(dirname+'/'+name); + dsc = utils.parse_changes(filename); + for field_name in [ "build-depends", "build-depends-indep" ]: + field = dsc.get(field_name); + if field: + try: + apt_pkg.ParseSrcDepends(field); + except: + print "E: [%s] %s: %s" % (filename, field_name, field); + pass; + +################################################################################ + +def check_build_depends(): + os.path.walk(Cnf["Dir::Root"], chk_bd_process_dir, None); + +################################################################################ + def main (): global Cnf, projectB, db_files, waste, excluded; @@ -434,6 +464,8 @@ def main (): check_indices_files_exist(); elif mode == "files-not-symlinks": check_files_not_symlinks(); + elif mode == "validate-builddeps": + check_build_depends(); else: utils.warn("unknown mode '%s'" % (mode)); usage(1);