Merge commit 'buxy/bugfixes' into merge

[dak.git] / dak / clean_suites.py

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 143b0ff271b2c90921387a5becdb5a3fa9634b6b..d6a966b554f623cb251e2d8cc69c85bda062f5b7 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -201,16 +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
-    query = "SELECT l.path, f.filename FROM location l, files f WHERE f.last_used <= '%s' AND l.id = f.location" % (delete_data)
+    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():
         filename = i[0] + i[1]
         if not os.path.exists(filename):
@@ -355,7 +355,6 @@ def main():
     if Options["Help"]:
         usage()
 
-    print max_delete
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
 
     now_date = time.strftime("%Y-%m-%d %H:%M")