X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=b65d1505e4dd13ec3d0766f16a4c34f088b19110;hb=80a20d680983f872a04f5f34e9bb7bf1024cc4c3;hp=573d57e7550af4c6a130b5d055724c52a62609ae;hpb=9ebfa30b056df56376cb0302a28a190e0aaed765;p=dak.git diff --git a/catherine b/catherine index 573d57e7..b65d1505 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.1 2000-11-24 00:20:11 troup Exp $ +# Copyright (C) 2000, 2001 James Troup +# $Id: catherine,v 1.9 2001-06-05 22:30:43 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,17 +18,108 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# "Welcome to where time stands still, +# No one leaves and no one will." +# - Sanitarium - Metallica / Master of the puppets + ################################################################################ -import pg -import utils -import apt_pkg; +import os, pg, stat, string, sys +import utils, db_access +import apt_pkg, apt_inst; ################################################################################ Cnf = None; projectB = None; +# 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 = 0L; + poolized_count = 0; + + # 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 and limit >= 0: + sys.stderr.write("Hit %s limit.\n" % (utils.size_type(limit))); + break; + poolized_size = poolized_size + size; + poolized_count = poolized_count + 1; + base_filename = os.path.basename(legacy_filename); + destination_filename = base_filename; + # Work out the source package name + if utils.re_isadeb.match(base_filename) != None: + 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", ""); + if package == "" or version == "" or architecture == "": + sys.stderr.write("%s: couldn't determine required information to rename .deb file.\n" % (legacy_filename)); + sys.exit(1); + version = utils.re_no_epoch.sub('', version); + destination_filename = "%s_%s_%s.deb" % (package, version, architecture); + else: + m = utils.re_issource.match(base_filename) + if m != None: + source = m.group(1); + else: + sys.stderr.write("%s: say what?\n" % (legacy_filename)); + sys.exit(1); + # Work out the component name + component = qid["component"]; + if component == "": + q = projectB.query("SELECT DISTINCT(c.name) FROM override o, component c WHERE o.package = '%s' AND o.component = c.id;" % (source)); + ql = q.getresult(); + if ql == []: + sys.stderr.write("%s: No override match so I can't work out the component.\n" % (source)); + sys.exit(1); + if len(ql) > 1: + sys.stderr.write("%s: multiple override matches for %s so I can't work out the component.\n" % (source)); + sys.exit(1); + component = ql[0][0]; + # Work out the new location + q = projectB.query("SELECT l.id FROM location l, component c WHERE c.name = '%s' AND c.id = l.component AND l.type = 'pool';" % (component)); + ql = q.getresult(); + if len(ql) != 1: + sys.stderr.write("%s: couldn't determine location ID, query returned %d matches and not 1 as expected.\n" % (source, len(ql))); + sys.exit(1); + location_id = ql[0][0]; + # First move the files to the new location + pool_location = utils.poolify (source, component); + pool_filename = pool_location + destination_filename; + destination = Cnf["Dir::PoolDir"] + pool_location + destination_filename; + if os.path.exists(destination): + sys.stderr.write("%s: already exists in the pool; serious FUBARity.\n" % (legacy_filename)); + sys.exit(1); + if verbose: + print "Moving: %s -> %s" % (legacy_filename, destination); + if not no_action: + utils.move(legacy_filename, destination); + # Then Update the DB's files table + if verbose: + print "SQL: UPDATE files SET filename = '%s', location = '%s' WHERE id = '%s'" % (pool_filename, 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 (): @@ -39,42 +130,46 @@ def main (): Cnf = apt_pkg.newConfiguration(); apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); - Arguments = [('d',"debug","Heidi::Options::Debug", "IntVal"), - ('h',"help","Heidi::Options::Help"), - ('v',"version","Heidi::Options::Version")]; - - amount = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - - print amount - - return + 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")]; - projectB = pg.connect('projectb', 'localhost'); + 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 (Cnf["Heidi::Options::Add"] == "" and Cnf["Heidi::Options::Remove"] == "") or (Cnf["Heidi::Options::Add"] != "" and Cnf["Heidi::Options::Remove"] != ""): - - sys.stderr.write("Need either --add or --remove command line argument; not neither or both.\n"); - sys.exit(2); - - for i in ("add", "remove"): - suite = Cnf["Heidi::Options::%s" % (i)]; - if suite !="": - if not Cnf.has_key("Suite::%s" % (suite)): - sys.stderr.write("Unknown suite %s.\n" %(suite)); - sys.exit(2); - else: - suite_id = db_access.get_suite_id(suite); - action = i; - - if file_list != []: - for file in file_list: - process_file(utils.open_file(file_list[0],'r'), suite_id, action); + if not Options["Limit"]: + limit = -1; else: - process_file(sys.stdin, suite_id, action); - - db_access.init (Cnf, projectB); + 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"]); #######################################################################################