X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_suites.py;h=d6a966b554f623cb251e2d8cc69c85bda062f5b7;hb=1e1457bde3318c6605b4c97d4299803fdaf8e774;hp=7537eb127e1d107023428d0b1c7b7378e5ea0ee2;hpb=5dc4a4e0017bd6f8d14d8ed2d07bcadbea35f81f;p=dak.git diff --git a/dak/clean_suites.py b/dak/clean_suites.py index 7537eb12..d6a966b5 100755 --- a/dak/clean_suites.py +++ b/dak/clean_suites.py @@ -201,15 +201,14 @@ 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 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" % maximum - sys.stdout.write("Limiting removals to %d" % Cnf["Clean-Suites::Options::Maximum"]) + query += " LIMIT %d" % max_delete + sys.stdout.write("Limiting removals to %d\n" % max_delete) q=projectB.query(query) for i in q.getresult():