X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=639d982299997abb294de1025f8af377ada65793;hb=984454aabdbb56e6818cf1e0c8aa30e6c5b9c8c9;hp=4015319d19245734e386a7dbfc72bdb109bde74f;hpb=502dd2a56d9a8dc58555874e54808b071acb6799;p=dak.git diff --git a/catherine b/catherine index 4015319d..639d9822 100755 --- a/catherine +++ b/catherine @@ -1,8 +1,8 @@ #!/usr/bin/env python # Poolify (move packages from "legacy" type locations to pool locations) -# Copyright (C) 2000 James Troup -# $Id: catherine,v 1.3 2001-02-04 04:27:18 troup Exp $ +# Copyright (C) 2000, 2001 James Troup +# $Id: catherine,v 1.8 2001-03-24 03:29:13 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 @@ -24,7 +24,7 @@ ################################################################################ -import os, pg, stat, sys +import os, pg, stat, string, sys import utils, db_access import apt_pkg, apt_inst; @@ -33,52 +33,26 @@ import apt_pkg, apt_inst; Cnf = None; projectB = None; -################################################################################ - -def main (): - global Cnf, projectB; - - apt_pkg.init(); - - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); - - Arguments = [('D',"debug","Catherine::Options::Debug", "IntVal"), - ('h',"help","Catherine::Options::Help"), - ('V',"version","Catherine::Options::Version"), - ('l',"limit", "Catherine::Options::Limit", "HasArg"), - ('n',"no-action","Catherine::Options::No-Action")]; - - amount = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - - projectB = pg.connect('projectb', 'localhost'); - db_access.init(Cnf, projectB); - +# Q is a python-postgresql query result set and must have the +# following four columns: +# o files.id (as 'files_id') +# o files.filename +# o location.path +# o component.name (as 'component') +# +# limit is a value in bytes or -1 for no limit (use with care!) +# verbose and no_action are booleans + +def poolize (q, limit, verbose, no_action): poolized_size = 0; poolized_count = 0; - limit = int(Cnf["Catherine::Options::Limit"]) * 1024; - # Sanity check the limit argument - if limit != 0 and limit < 1024: - sys.stderr.write("-l/--limit takes an argument with a value in kilobytes.\n"); - sys.exit(1); - - # Grab a list of all files not already in the pool - q = projectB.query(""" -SELECT l.path, f.filename, f.id as files_id, c.name as component - FROM files f, location l, component c WHERE - NOT EXISTS (SELECT * FROM location l WHERE l.type = 'pool' AND f.location = l.id) - AND NOT (f.filename ~ '^potato') AND f.location = l.id AND l.component = c.id -UNION SELECT l.path, f.filename, f.id as files_id, null as component - FROM files f, location l WHERE - NOT EXISTS (SELECT * FROM location l WHERE l.type = 'pool' AND f.location = l.id) - AND NOT (f.filename ~ '^potato') AND f.location = l.id AND NOT EXISTS - (SELECT l.path FROM location l WHERE l.component IS NOT NULL AND f.location = l.id);"""); + # Parse -l/--limit argument qd = q.dictresult(); for qid in qd: legacy_filename = qid["path"]+qid["filename"]; size = os.stat(legacy_filename)[stat.ST_SIZE]; - if (poolized_size + size) > limit: + if (poolized_size + size) > limit and limit >= 0: sys.stderr.write("Hit %s limit.\n" % (utils.size_type(limit))); break; poolized_size = poolized_size + size; @@ -90,6 +64,9 @@ UNION SELECT l.path, f.filename, f.id as files_id, null as component control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(legacy_filename,"r"))) package = control.Find("Package", ""); source = control.Find("Source", package); + if string.find(source, "(") != -1: + m = utils.re_extract_src_version.match(source) + source = m.group(1) # If it's a binary, we need to also rename the file to include the architecture version = control.Find("Version", ""); architecture = control.Find("Architecture", ""); @@ -131,19 +108,68 @@ UNION SELECT l.path, f.filename, f.id as files_id, null as component if os.path.exists(destination): sys.stderr.write("%s: already exists in the pool; serious FUBARity.\n" % (legacy_filename)); sys.exit(1); - if Cnf["Catherine::Options::No-Action"]: + if verbose: print "Moving: %s -> %s" % (legacy_filename, destination); - else: - foo = foo + 1; - #utils.move(legacy_filename, destination); + if not no_action: + utils.move(legacy_filename, destination); # Then Update the DB's files table - if Cnf["Catherine::Options::No-Action"]: + if verbose: print "SQL: UPDATE files SET filename = '%s', location = '%s' WHERE id = '%s'" % (pool_filename, location_id, qid["files_id"]); - else: - foo = foo + 1; - #q = projectB.query("UPDATE files SET filename = '%s', location = '%s' WHERE id = '%s'" % (pool_filename, dsc_location_id, qid["files_id"])); + if not no_action: + q = projectB.query("UPDATE files SET filename = '%s', location = '%s' WHERE id = '%s'" % (pool_filename, location_id, qid["files_id"])); sys.stderr.write("Poolized %s in %s files.\n" % (utils.size_type(poolized_size), poolized_count)); + +################################################################################ + +def main (): + global Cnf, projectB; + + apt_pkg.init(); + + Cnf = apt_pkg.newConfiguration(); + apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); + + Arguments = [('D',"debug","Catherine::Options::Debug", "IntVal"), + ('h',"help","Catherine::Options::Help"), + ('V',"version","Catherine::Options::Version"), + ('l',"limit", "Catherine::Options::Limit", "HasArg"), + ('n',"no-action","Catherine::Options::No-Action"), + ('v',"verbose","Catherine::Options::Verbose")]; + + apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + Options = Cnf.SubTree("Catherine::Options") + + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); + db_access.init(Cnf, projectB); + + if not Options["Limit"]: + limit = -1; + else: + limit = int(Options["Limit"]) * 1024; + + # -n/--no-action implies -v/--verbose + if Options["No-Action"]: + Options["Verbose"] = "true"; + + # Sanity check the limit argument + if limit > 0 and limit < 1024: + sys.stderr.write("-l/--limit takes an argument with a value in kilobytes.\n"); + sys.exit(1); + + # Grab a list of all files not already in the pool + q = projectB.query(""" +SELECT l.path, f.filename, f.id as files_id, c.name as component + FROM files f, location l, component c WHERE + NOT EXISTS (SELECT * FROM location l WHERE l.type = 'pool' AND f.location = l.id) + AND NOT (f.filename ~ '^potato') AND f.location = l.id AND l.component = c.id +UNION SELECT l.path, f.filename, f.id as files_id, null as component + FROM files f, location l WHERE + NOT EXISTS (SELECT * FROM location l WHERE l.type = 'pool' AND f.location = l.id) + AND NOT (f.filename ~ '^potato') AND f.location = l.id AND NOT EXISTS + (SELECT l.path FROM location l WHERE l.component IS NOT NULL AND f.location = l.id);"""); + + poolize(q, limit, Options["Verbose"], Options["No-Action"]); #######################################################################################