X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=66efca2d60a8283ebc8fb501e2334e8f15daf28e;hb=950d3a6f5d3733d912a9e9b586d8de7d9405db7b;hp=b65d1505e4dd13ec3d0766f16a4c34f088b19110;hpb=80a20d680983f872a04f5f34e9bb7bf1024cc4c3;p=dak.git diff --git a/catherine b/catherine index b65d1505..66efca2d 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, 2001 James Troup -# $Id: catherine,v 1.9 2001-06-05 22:30:43 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup +# $Id: catherine,v 1.19 2004-03-11 00:20:51 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,14 +18,16 @@ # 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 os, pg, stat, string, sys -import utils, db_access +import os, pg, re, stat, sys; +import utils, db_access; import apt_pkg, apt_inst; ################################################################################ @@ -33,6 +35,23 @@ import apt_pkg, apt_inst; Cnf = None; projectB = None; +re_isadeb = re.compile (r"(.+?)_(.+?)(_(.+))?\.u?deb$"); + +################################################################################ + +def usage (exit_code=0): + print """Usage: catherine [OPTIONS] +Migrate packages from legacy locations into the pool. + + -l, --limit=AMOUNT only migrate AMOUNT Kb of packages + -n, --no-action don't do anything + -v, --verbose explain what is being done + -h, --help show this help and exit""" + + sys.exit(exit_code) + +################################################################################ + # Q is a python-postgresql query result set and must have the # following four columns: # o files.id (as 'files_id') @@ -53,61 +72,55 @@ def poolize (q, limit, verbose, no_action): 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))); + utils.warn("Hit %s limit." % (utils.size_type(limit))); break; - poolized_size = poolized_size + size; - poolized_count = poolized_count + 1; + poolized_size += size; + 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"))) + if re_isadeb.match(base_filename): + control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(legacy_filename))) package = control.Find("Package", ""); source = control.Find("Source", package); - if string.find(source, "(") != -1: + if source.find("(") != -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); + utils.fubar("%s: couldn't determine required information to rename .deb file." % (legacy_filename)); 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: + if m: source = m.group(1); else: - sys.stderr.write("%s: say what?\n" % (legacy_filename)); - sys.exit(1); + utils.fubar("expansion of source filename '%s' failed." % (legacy_filename)); # 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 not ql: + utils.fubar("No override match for '%s' so I can't work out the component." % (source)); 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); + utils.fubar("Multiple override matches for '%s' so I can't work out the component." % (source)); 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); + utils.fubar("couldn't determine location ID for '%s'. [query returned %d matches, not 1 as expected]" % (source, len(ql))); 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; + destination = Cnf["Dir::Pool"] + 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); + utils.fubar("'%s' already exists in the pool; serious FUBARity." % (legacy_filename)); if verbose: print "Moving: %s -> %s" % (legacy_filename, destination); if not no_action: @@ -119,20 +132,20 @@ def poolize (q, limit, verbose, 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()); + Cnf = utils.get_conf() - Arguments = [('D',"debug","Catherine::Options::Debug", "IntVal"), - ('h',"help","Catherine::Options::Help"), - ('V',"version","Catherine::Options::Version"), + for i in ["help", "limit", "no-action", "verbose" ]: + if not Cnf.has_key("Catherine::Options::%s" % (i)): + Cnf["Catherine::Options::%s" % (i)] = ""; + + + Arguments = [('h',"help","Catherine::Options::Help"), ('l',"limit", "Catherine::Options::Limit", "HasArg"), ('n',"no-action","Catherine::Options::No-Action"), ('v',"verbose","Catherine::Options::Verbose")]; @@ -140,6 +153,9 @@ def main (): apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); Options = Cnf.SubTree("Catherine::Options") + if Options["Help"]: + usage(); + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); @@ -154,20 +170,19 @@ def main (): # 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); + utils.fubar("-l/--limit takes an argument with a value in kilobytes."); # 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 +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 1 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);"""); + FROM files f, location l WHERE + NOT EXISTS (SELECT 1 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 1 FROM location l WHERE l.component IS NOT NULL AND f.location = l.id);"""); poolize(q, limit, Options["Verbose"], Options["No-Action"]);