Merge branch 'master' into content_generation

[dak.git] / dak / clean_suites.py

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 6b7171fa8bf99589e20aae99cd61577e73fbac53..7537eb127e1d107023428d0b1c7b7378e5ea0ee2 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -206,11 +206,12 @@ def clean():
         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"])
 
+    q=projectB.query(query)
     for i in q.getresult():
         filename = i[0] + i[1]
         if not os.path.exists(filename):