X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_suites.py;h=d6a966b554f623cb251e2d8cc69c85bda062f5b7;hb=35cd0972b5e14dc8727403e13fccd30776f3ae02;hp=5523d63353bfa34f1eddb44174f6e74b8aed18de;hpb=81d0c91b0d085b66aa40a9e147698f618b825d62;p=dak.git

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 5523d633..d6a966b5 100755
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -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
 
@@ -199,12 +201,16 @@ 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):
@@ -321,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 = utils.get_conf()
-    for i in ["Help", "No-Action" ]:
+    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()