Show correct actions while processing NEW queue

[dak.git] / dak / clean_suites.py

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index caa69709b2561333c1e95d61878d8fc29cf297c0..e7808ec9c77cb0dbbb5f4eabd3fd918841de5e9e 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -214,7 +214,7 @@ def clean_binaries(now_date, session):
          AND NOT EXISTS (SELECT 1 FROM files_archive_map af
                                   JOIN archive_delete_date ad ON af.archive_id = ad.archive_id
                                  WHERE af.file_id = b.file
-                                   AND (af.last_used IS NULL OR af.last_used >= ad.delete_date))
+                                   AND (af.last_used IS NULL OR af.last_used > ad.delete_date))
       RETURNING f.filename
     """)
     for b in q:
@@ -222,7 +222,7 @@ def clean_binaries(now_date, session):
 
 ########################################
 
-def clean(now_date, max_delete, session):
+def clean(now_date, archives, max_delete, session):
     cnf = Config()
 
     count = 0
@@ -254,7 +254,7 @@ def clean(now_date, max_delete, session):
            AND NOT EXISTS (SELECT 1 FROM files_archive_map af
                                     JOIN archive_delete_date ad ON af.archive_id = ad.archive_id
                                    WHERE af.file_id = source.file
-                                     AND (af.last_used IS NULL OR af.last_used >= ad.delete_date))
+                                     AND (af.last_used IS NULL OR af.last_used > ad.delete_date))
         RETURNING source.id AS id, f.filename AS filename
       ),
       deleted_dsc_files AS (
@@ -280,6 +280,10 @@ def clean(now_date, max_delete, session):
         old_files = old_files.limit(max_delete)
         print "Limiting removals to %d" % max_delete
 
+    if archives is not None:
+        archive_ids = [ a.archive_id for a in archives ]
+        old_files = old_files.filter(ArchiveFile.archive_id.in_(archive_ids))
+
     for af in old_files:
         filename = af.path
         if not os.path.exists(filename):
@@ -445,6 +449,7 @@ def main():
             cnf["Clean-Suites::Options::%s" % (i)] = ""
 
     Arguments = [('h',"help","Clean-Suites::Options::Help"),
+                 ('a','archive','Clean-Suites::Options::Archive','HasArg'),
                  ('n',"no-action","Clean-Suites::Options::No-Action"),
                  ('m',"maximum","Clean-Suites::Options::Maximum", "HasArg")]
 
@@ -465,10 +470,20 @@ def main():
     if Options["Help"]:
         usage()
 
-    Logger = daklog.Logger("clean-suites", debug=Options["No-Action"])
+    program = "clean-suites"
+    if Options['No-Action']:
+        program = "clean-suites (no action)"
+    Logger = daklog.Logger(program, debug=Options["No-Action"])
 
     session = DBConn().session()
 
+    archives = None
+    if 'Archive' in Options:
+        archive_names = Options['Archive'].split(',')
+        archives = session.query(Archive).filter(Archive.archive_name.in_(archive_names)).all()
+        if len(archives) == 0:
+            utils.fubar('Unknown archive.')
+
     now_date = datetime.now()
 
     set_archive_delete_dates(now_date, session)
@@ -477,7 +492,7 @@ def main():
     clean_binaries(now_date, session)
     check_sources(now_date, session)
     check_files(now_date, session)
-    clean(now_date, max_delete, session)
+    clean(now_date, archives, max_delete, session)
     clean_maintainers(now_date, session)
     clean_fingerprints(now_date, session)
     clean_empty_directories(session)