X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_suites.py;h=b5904836d6c98213143a76458a721a6256fdb7b5;hb=425e44739cd77ffa01294f23e94ae7eabd5f5ec8;hp=7aa6bee568f0f85555cf993e4ba451e0bb0004af;hpb=7aaaad3135c9164390af5897925660842368660b;p=dak.git diff --git a/dak/clean_suites.py b/dak/clean_suites.py index 7aa6bee5..b5904836 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 dak.lib.utils as 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) ################################################################################ @@ -177,14 +179,13 @@ def clean_binaries(): if not Options["No-Action"]: before = time.time() sys.stdout.write("[Deleting from binaries table... ") - sys.stderr.write("DELETE FROM binaries WHERE EXISTS (SELECT 1 FROM files WHERE binaries.file = files.id AND files.last_used <= '%s')\n" % (delete_date)) projectB.query("DELETE FROM binaries WHERE EXISTS (SELECT 1 FROM files WHERE binaries.file = files.id AND files.last_used <= '%s')" % (delete_date)) sys.stdout.write("done. (%d seconds)]\n" % (int(time.time()-before))) ######################################## def clean(): - global delete_date, now_date + global delete_date, now_date, max_delete count = 0 size = 0 @@ -200,11 +201,17 @@ def clean(): before = time.time() sys.stdout.write("[Deleting from source table... ") projectB.query("DELETE FROM dsc_files WHERE EXISTS (SELECT 1 FROM source s, files f, dsc_files df WHERE f.last_used <= '%s' AND s.file = f.id AND s.id = df.source AND df.id = dsc_files.id)" % (delete_date)) + projectB.query("DELETE FROM src_uploaders WHERE EXISTS (SELECT 1 FROM source s, files f WHERE f.last_used <= '%s' AND s.file = f.id AND s.id = src_uploaders.source)" % (delete_date)) projectB.query("DELETE FROM source WHERE EXISTS (SELECT 1 FROM files WHERE source.file = files.id AND files.last_used <= '%s')" % (delete_date)) 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): @@ -250,7 +257,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 @@ -272,7 +280,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() @@ -319,19 +328,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 = 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)] = "" + 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() @@ -353,4 +374,3 @@ def main(): if __name__ == '__main__': main() -