X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=ce4b3dff1545b9ffba1d65d40be1fffe77f5832f;hb=965f23a17180491622c2e4bc43f53433682973b4;hp=35885886a1d78f38c90d0d22040666c64fb7bcf1;hpb=d52ebffcc7af210985d90ffc58e7ecc4141dd8a8;p=dak.git diff --git a/catherine b/catherine index 35885886..ce4b3dff 100755 --- a/catherine +++ b/catherine @@ -2,7 +2,7 @@ # Poolify (move packages from "legacy" type locations to pool locations) # Copyright (C) 2000, 2001 James Troup -# $Id: catherine,v 1.6 2001-03-02 02:24:33 troup Exp $ +# $Id: catherine,v 1.10 2001-06-22 22:53:14 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,63 +33,27 @@ 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"), - ('v',"verbose","Catherine::Options::Verbose")]; - - apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - - projectB = pg.connect('projectb', 'localhost'); - db_access.init(Cnf, projectB); - - poolized_size = 0; +# 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 - if not Cnf["Catherine::Options::Limit"]: - limit = -1; - else: - limit = int(Cnf["Catherine::Options::Limit"]) * 1024; - - # -n/--no-action implies -v/--verbose - if Cnf["Catherine::Options::No-Action"]: - Cnf["Catherine::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);"""); 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))); + utils.warn("Hit %s limit." % (utils.size_type(limit))); break; poolized_size = poolized_size + size; poolized_count = poolized_count + 1; @@ -107,8 +71,7 @@ UNION SELECT l.path, f.filename, f.id as files_id, null as component 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: @@ -116,45 +79,90 @@ UNION SELECT l.path, f.filename, f.id as files_id, null as component if m != None: source = m.group(1); else: - sys.stderr.write("%s: say what?\n" % (legacy_filename)); - sys.exit(1); + utils.fubar("expandsion 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); + 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; 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::Verbose"]: + utils.fubar("'%s' already exists in the pool; serious FUBARity." % (legacy_filename)); + if verbose: print "Moving: %s -> %s" % (legacy_filename, destination); - if not Cnf["Catherine::Options::No-Action"]: + if not no_action: utils.move(legacy_filename, destination); # Then Update the DB's files table - if Cnf["Catherine::Options::Verbose"]: + if verbose: print "SQL: UPDATE files SET filename = '%s', location = '%s' WHERE id = '%s'" % (pool_filename, location_id, qid["files_id"]); - if not Cnf["Catherine::Options::No-Action"]: + 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: + 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 +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"]); #######################################################################################