X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_suites.py;h=d6a966b554f623cb251e2d8cc69c85bda062f5b7;hb=6d052c1fd60a88eaa8250ed1927c59d89a80a775;hp=c9a81539ec0908145ae7ed8781a6c04dd1418cb2;hpb=4f9d6febec4d4a4519edc50cbd1d196c8376ac54;p=dak.git diff --git a/dak/clean_suites.py b/dak/clean_suites.py index c9a81539..d6a966b5 100755 --- a/dak/clean_suites.py +++ b/dak/clean_suites.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Cleans up unassociated binary and source packages +""" Cleans up unassociated binary and source packages """ # Copyright (C) 2000, 2001, 2002, 2003, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -30,7 +30,7 @@ import os, pg, stat, sys, time import apt_pkg -import daklib.utils +from daklib import utils ################################################################################ @@ -39,6 +39,7 @@ Cnf = None Options = None now_date = None; # mark newly "deleted" things as deleted "now" delete_date = None; # delete things marked "deleted" earler than this +max_delete = None ################################################################################ @@ -47,7 +48,8 @@ def usage (exit_code=0): Clean old packages from suites. -n, --no-action don't do anything - -h, --help show this help and exit""" + -h, --help show this help and exit + -m, --maximum maximum number of files to remove""" sys.exit(exit_code) ################################################################################ @@ -183,7 +185,7 @@ def clean_binaries(): ######################################## def clean(): - global delete_date, now_date + global delete_date, now_date, max_delete count = 0 size = 0 @@ -203,11 +205,16 @@ def clean(): sys.stdout.write("done. (%d seconds)]\n" % (int(time.time()-before))) # Delete files from the pool - q = projectB.query("SELECT l.path, f.filename FROM location l, files f WHERE f.last_used <= '%s' AND l.id = f.location" % (delete_date)) + query = "SELECT l.path, f.filename FROM location l, files f WHERE f.last_used <= '%s' AND l.id = f.location" % (delete_date) + if max_delete is not None: + query += " LIMIT %d" % max_delete + sys.stdout.write("Limiting removals to %d\n" % max_delete) + + q=projectB.query(query) for i in q.getresult(): filename = i[0] + i[1] if not os.path.exists(filename): - daklib.utils.warn("can not find '%s'." % (filename)) + utils.warn("can not find '%s'." % (filename)) continue if os.path.isfile(filename): if os.path.islink(filename): @@ -223,14 +230,14 @@ def clean(): dest_filename = dest + '/' + os.path.basename(filename) # If the destination file exists; try to find another filename to use if os.path.exists(dest_filename): - dest_filename = daklib.utils.find_next_free(dest_filename) + dest_filename = utils.find_next_free(dest_filename) if Options["No-Action"]: print "Cleaning %s -> %s ..." % (filename, dest_filename) else: - daklib.utils.move(filename, dest_filename) + utils.move(filename, dest_filename) else: - daklib.utils.fubar("%s is neither symlink nor file?!" % (filename)) + utils.fubar("%s is neither symlink nor file?!" % (filename)) # Delete from the 'files' table if not Options["No-Action"]: @@ -239,7 +246,7 @@ def clean(): projectB.query("DELETE FROM files WHERE last_used <= '%s'" % (delete_date)) sys.stdout.write("done. (%d seconds)]\n" % (int(time.time()-before))) if count > 0: - sys.stderr.write("Cleaned %d files, %s.\n" % (count, daklib.utils.size_type(size))) + sys.stderr.write("Cleaned %d files, %s.\n" % (count, utils.size_type(size))) ################################################################################ @@ -249,7 +256,8 @@ def clean_maintainers(): q = projectB.query(""" SELECT m.id FROM maintainer m WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.maintainer = m.id) - AND NOT EXISTS (SELECT 1 FROM source s WHERE s.maintainer = m.id)""") + AND NOT EXISTS (SELECT 1 FROM source s WHERE s.maintainer = m.id OR s.changedby = m.id) + AND NOT EXISTS (SELECT 1 FROM src_uploaders u WHERE u.maintainer = m.id)""") ql = q.getresult() count = 0 @@ -271,7 +279,8 @@ def clean_fingerprints(): q = projectB.query(""" SELECT f.id FROM fingerprint f - WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.sig_fpr = f.id) + WHERE f.keyring IS NULL + AND NOT EXISTS (SELECT 1 FROM binaries b WHERE b.sig_fpr = f.id) AND NOT EXISTS (SELECT 1 FROM source s WHERE s.sig_fpr = f.id)""") ql = q.getresult() @@ -304,10 +313,10 @@ def clean_queue_build(): for i in q.getresult(): filename = i[0] if not os.path.exists(filename): - daklib.utils.warn("%s (from queue_build) doesn't exist." % (filename)) + utils.warn("%s (from queue_build) doesn't exist." % (filename)) continue if not Cnf.FindB("Dinstall::SecurityQueueBuild") and not os.path.islink(filename): - daklib.utils.fubar("%s (from queue_build) should be a symlink but isn't." % (filename)) + utils.fubar("%s (from queue_build) should be a symlink but isn't." % (filename)) os.unlink(filename) count += 1 projectB.query("DELETE FROM queue_build WHERE last_used <= '%s'" % (our_delete_date)) @@ -318,19 +327,31 @@ def clean_queue_build(): ################################################################################ def main(): - global Cnf, Options, projectB, delete_date, now_date + global Cnf, Options, projectB, delete_date, now_date, max_delete - Cnf = daklib.utils.get_conf() - for i in ["Help", "No-Action" ]: - if not Cnf.has_key("Clean-Suites::Options::%s" % (i)): - Cnf["Clean-Suites::Options::%s" % (i)] = "" + Cnf = utils.get_conf() + for i in ["Help", "No-Action", "Maximum" ]: + if not Cnf.has_key("Clean-Suites::Options::%s" % (i)): + Cnf["Clean-Suites::Options::%s" % (i)] = "" Arguments = [('h',"help","Clean-Suites::Options::Help"), - ('n',"no-action","Clean-Suites::Options::No-Action")] + ('n',"no-action","Clean-Suites::Options::No-Action"), + ('m',"maximum","Clean-Suites::Options::Maximum", "HasArg")] apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) Options = Cnf.SubTree("Clean-Suites::Options") + if Cnf["Clean-Suites::Options::Maximum"] != "": + try: + # Only use Maximum if it's an integer + max_delete = int(Cnf["Clean-Suites::Options::Maximum"]) + if max_delete < 1: + utils.fubar("If given, Maximum must be at least 1") + except ValueError, e: + utils.fubar("If given, Maximum must be an integer") + else: + max_delete = None + if Options["Help"]: usage() @@ -352,4 +373,3 @@ def main(): if __name__ == '__main__': main() -