X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tea;h=bae4dcaead825ae1a5ec064626be0b1e3b953803;hb=6cc79b7b093af0c68c9d80c61d5aa7cfe72c9188;hp=b6a28095e926ffb35a87606b7bc5cb359f036c3f;hpb=8ecf66b7d933929ca5f504a32fb54542b0b87b71;p=dak.git diff --git a/tea b/tea index b6a28095..bae4dcae 100755 --- a/tea +++ b/tea @@ -2,7 +2,7 @@ # Sanity check the database # Copyright (C) 2000, 2001, 2002 James Troup -# $Id: tea,v 1.18 2002-05-08 11:13:02 troup Exp $ +# $Id: tea,v 1.22 2003-01-02 18:14:02 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 @@ -18,6 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################ + # And, lo, a great and menacing voice rose from the depths, and with # great wrath and vehemence it's voice boomed across the # land... ``hehehehehehe... that *tickles*'' @@ -25,7 +27,7 @@ ################################################################################ -import pg, sys, os, string, stat, time +import pg, sys, os, stat, time import utils, db_access import apt_pkg, apt_inst; @@ -42,19 +44,39 @@ current_time = time.time(); ################################################################################ +def usage(exit_code=0): + print """Usage: tea MODE +Run various sanity checks of the archive and/or database. + + -h, --help show this help and exit. + +The following MODEs are available: + + md5sums - validate the md5sums stored in the database + files - check files in the database against what's in the archive + dsc-syntax - validate the syntax of .dsc files in the archive + missing-overrides - check for missing overrides + source-in-one-dir - ensure the source for each package is in one directory + timestamps - check for future timestamps in .deb's + tar-gz-in-dsc - ensure each .dsc lists a .tar.gz file +""" + sys.exit(exit_code) + +################################################################################ + def process_dir (unused, dirname, filenames): global waste, db_files, excluded; - if string.find(dirname, '/disks-') != -1 or string.find(dirname, 'upgrade-') != -1: + if dirname.find('/disks-') != -1 or dirname.find('upgrade-') != -1: return; # hack; can't handle .changes files - if string.find(dirname, 'proposed-updates') != -1: + if dirname.find('proposed-updates') != -1: return; for name in filenames: filename = os.path.abspath(dirname+'/'+name); - filename = string.replace(filename, 'potato-proposed-updates', 'proposed-updates'); + 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 = waste + os.stat(filename)[stat.ST_SIZE]; + waste += os.stat(filename)[stat.ST_SIZE]; print filename ################################################################################ @@ -62,8 +84,7 @@ def process_dir (unused, dirname, filenames): def check_files(): global db_files; - print "Building list of Database 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") ql = q.getresult(); @@ -94,16 +115,16 @@ def check_dscs(): for component in Cnf.SubTree("Component").List(): if component == "mixed": continue; - component = string.lower(component); + component = component.lower(); 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]; try: - utils.parse_changes(file, 1); + utils.parse_changes(file, dsc_whitespace_rules=1); except utils.invalid_dsc_format_exc, line: utils.warn("syntax error in .dsc file '%s', line %s." % (file, line)); - count = count + 1; + count += 1; if count: utils.warn("Found %s invalid .dsc files." % (count)); @@ -147,7 +168,7 @@ SELECT l.path, f.filename FROM files f, dsc_files df, location l WHERE df.source first_filename = ""; broken = 0; for j in q2.getresult(): - filename = j[0]+j[1]; + filename = j[0] + j[1]; path = os.path.dirname(filename); if first_path == "": first_path = path; @@ -158,7 +179,7 @@ SELECT l.path, f.filename FROM files f, dsc_files df, location l WHERE df.source broken = 1; print "WOAH, we got a live one here... %s [%s] {%s}" % (filename, source_id, symlink); if broken: - broken_count = broken_count + 1; + broken_count += 1; print "Found %d source packages where the source is not all in one directory." % (broken_count); ################################################################################ @@ -217,7 +238,7 @@ def check_timestamps(): apt_inst.debExtract(file,Ent,"control.tar.gz"); file.seek(0); apt_inst.debExtract(file,Ent,"data.tar.gz"); - count = count + 1; + count += 1; print "Checked %d files (out of %d)." % (count, len(db_files.keys())); ################################################################################ @@ -225,15 +246,21 @@ def check_timestamps(): def check_missing_tar_gz_in_dsc(): count = 0; - q = projectB.query("SELECT l.path, f.filename FROM files f, location l WHERE f.location = l.id AND f.filename ~ '.dsc$'") - for i in q.getresult(): + print "Building list of database files..."; + q = projectB.query("SELECT l.path, f.filename FROM files f, location l WHERE f.location = l.id AND f.filename ~ '.dsc$'"); + ql = q.getresult(); + if ql: + print "Checking %d files..." % len(ql); + else: + print "No files to check." + for i in ql: filename = os.path.abspath(i[0] + i[1]); try: # NB: don't enforce .dsc syntax - dsc = utils.parse_changes(filename, 0); + dsc = utils.parse_changes(filename); except: utils.fubar("error parsing .dsc file '%s'." % (filename)); - dsc_files = utils.build_file_list(dsc, 1); + 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); @@ -244,7 +271,7 @@ def check_missing_tar_gz_in_dsc(): has_tar = 1; if not has_tar: utils.warn("%s has no .tar.gz in the .dsc file." % (file)); - count = count + 1; + count += 1; if count: utils.warn("Found %s invalid .dsc files." % (count)); @@ -254,21 +281,48 @@ def check_missing_tar_gz_in_dsc(): def main (): global Cnf, projectB, db_files, waste, excluded; - Cnf = utils.get_conf() + Cnf = utils.get_conf(); + Arguments = [('h',"help","Tea::Options::Help")]; + for i in [ "help" ]: + if not Cnf.has_key("Tea::Options::%s" % (i)): + Cnf["Tea::Options::%s" % (i)] = ""; + + args = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv); + + Options = Cnf.SubTree("Tea::Options") + if Options["Help"]: + usage(); + + if len(args) < 1: + utils.warn("tea requires at least one argument"); + usage(1); + elif len(args) > 1: + utils.warn("tea accepts only one argument"); + usage(1); + mode = args[0].lower(); - apt_pkg.ParseCommandLine(Cnf,[],sys.argv); projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); - #check_md5sums(); - #check_source_in_one_dir(); - #check_override(); - #check_dscs(); - #check_files(); - #check_timestamps(); - check_missing_tar_gz_in_dsc(); + if mode == "md5sums": + check_md5sums(); + elif mode == "files": + check_files(); + elif mode == "dsc-syntax": + check_dscs(); + elif mode == "missing-overrides": + check_override(); + elif mode == "source-in-one-dir": + check_source_in_one_dir(); + elif mode == "timestamps": + check_timestamps(); + elif mode == "tar-gz-in-dsc": + check_missing_tar_gz_in_dsc(); + else: + utils.warn("unknown mode '%s'" % (mode)); + usage(1); -####################################################################################### +################################################################################ if __name__ == '__main__': main();