point release notes

[dak.git] / dak / clean_suites.py

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 0553b28db31c31567985ab1501706833bb0378a8..a30d3d8a62452a9503ef474bbcd3d6d459a60d42 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -237,7 +237,7 @@ def clean(now_date, delete_date, max_delete, session):
 
     cur_date = now_date.strftime("%Y-%m-%d")
     dest = os.path.join(cnf["Dir::Morgue"], cnf["Clean-Suites::MorgueSubDir"], cur_date)
-    if not os.path.exists(dest):
+    if not Options["No-Action"] and not os.path.exists(dest):
         os.mkdir(dest)
 
     # Delete from source
@@ -357,46 +357,13 @@ SELECT f.id, f.fingerprint FROM fingerprint f
 
 ################################################################################
 
-def clean_queue_build(now_date, delete_date, max_delete, session):
-
-    cnf = Config()
-
-    if not cnf.ValueList("Dinstall::QueueBuildSuites") or Options["No-Action"]:
-        return
-
-    print "Cleaning out queue build symlinks..."
-
-    our_delete_date = now_date - timedelta(seconds = int(cnf["Clean-Suites::QueueBuildStayOfExecution"]))
-    count = 0
-
-    for qf in session.query(BuildQueueFile).filter(BuildQueueFile.last_used <= our_delete_date):
-        if not os.path.exists(qf.filename):
-            utils.warn("%s (from queue_build) doesn't exist." % (qf.filename))
-            continue
-
-        if not cnf.FindB("Dinstall::SecurityQueueBuild") and not os.path.islink(qf.filename):
-            utils.fubar("%s (from queue_build) should be a symlink but isn't." % (qf.filename))
-
-        Logger.log(["delete queue build", qf.filename])
-        if not Options["No-Action"]:
-            os.unlink(qf.filename)
-            session.delete(qf)
-        count += 1
-
-    if not Options["No-Action"]:
-        session.commit()
-
-    if count:
-        Logger.log(["total", count])
-        print "Cleaned %d queue_build files." % (count)
-
-################################################################################
-
 def clean_empty_directories(session):
     """
     Removes empty directories from pool directories.
     """
 
+    print "Cleaning out empty directories..."
+
     count = 0
 
     cursor = session.execute(
@@ -463,7 +430,6 @@ def main():
     clean(now_date, delete_date, max_delete, session)
     clean_maintainers(now_date, delete_date, max_delete, session)
     clean_fingerprints(now_date, delete_date, max_delete, session)
-    clean_queue_build(now_date, delete_date, max_delete, session)
     clean_empty_directories(session)
 
     Logger.close()