X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_suites.py;h=52b2a8ccb1f4504003ff487493305e9577ef707c;hb=1fa1f22b70c6ee46aea78ee40b9797a574d7c583;hp=24ab0d6c5b60263da3dfb95a2fd2ac07d6d4281c;hpb=a5d7d22121e018672da9dd74c89c046fb4dba1f9;p=dak.git

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 24ab0d6c..52b2a8cc 100755
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -359,6 +359,33 @@ def clean_queue_build(now_date, delete_date, max_delete, session):
 
 ################################################################################
 
+def clean_empty_directories(session):
+    """
+    Removes empty directories from pool directories.
+    """
+
+    count = 0
+
+    cursor = session.execute(
+        "SELECT DISTINCT(path) FROM location WHERE type = :type",
+        {'type': 'pool'},
+    )
+    bases = [x[0] for x in cursor.fetchall()]
+
+    for base in bases:
+        for dirpath, dirnames, filenames in os.walk(base, topdown=False):
+            if not filenames and not dirnames:
+                to_remove = os.path.join(base, dirpath)
+                if not Options["No-Action"]:
+                    Logger.log(["removing directory", to_remove])
+                    os.removedirs(to_remove)
+                count += 1
+
+    if count:
+        Logger.log(["total removed directories", count])
+
+################################################################################
+
 def main():
     global Options, Logger
 
@@ -404,6 +431,7 @@ def main():
     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()