X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=80ff5b7202907963ae0c8c6741e7c34e8a252fbb;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=ce4b3dff1545b9ffba1d65d40be1fffe77f5832f;hpb=6ada259d555e36a1546789c280edc3f944b7de7f;p=dak.git diff --git a/catherine b/catherine index ce4b3dff..80ff5b72 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.10 2001-06-22 22:53:14 troup Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $Id: catherine,v 1.16 2002-05-08 11:13: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 @@ -33,6 +33,21 @@ import apt_pkg, apt_inst; Cnf = None; projectB = None; +################################################################################ + +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') @@ -61,7 +76,7 @@ def poolize (q, limit, verbose, no_action): 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"))) + 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: @@ -79,13 +94,13 @@ def poolize (q, limit, verbose, no_action): if m != None: source = m.group(1); else: - utils.fubar("expandsion of source filename '%s' failed." % (legacy_filename)); + 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 == []: + if not ql: utils.fubar("No override match for '%s' so I can't work out the component." % (source)); if len(ql) > 1: utils.fubar("Multiple override matches for '%s' so I can't work out the component." % (source)); @@ -99,7 +114,7 @@ def poolize (q, limit, verbose, no_action): # 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): utils.fubar("'%s' already exists in the pool; serious FUBARity." % (legacy_filename)); if verbose: @@ -113,20 +128,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() + + for i in ["help", "limit", "no-action", "verbose" ]: + if not Cnf.has_key("Catherine::Options::%s" % (i)): + Cnf["Catherine::Options::%s" % (i)] = ""; - Arguments = [('D',"debug","Catherine::Options::Debug", "IntVal"), - ('h',"help","Catherine::Options::Help"), - ('V',"version","Catherine::Options::Version"), + + Arguments = [('h',"help","Catherine::Options::Help"), ('l',"limit", "Catherine::Options::Limit", "HasArg"), ('n',"no-action","Catherine::Options::No-Action"), ('v',"verbose","Catherine::Options::Verbose")]; @@ -134,6 +149,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); @@ -152,14 +170,14 @@ def main (): # 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 * 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 + 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"]);