Merge remote-tracking branch 'ansgar/pu/multiarchive-1'

[dak.git] / dak / clean_suites.py

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index e9360012550da7fd686a5d1db17951eda60d0873..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:
@@ -254,7 +254,7 @@ def clean(now_date, archives, 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 (
@@ -470,7 +470,10 @@ 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()