From e440020557c978ff67b7406fbf76283bb31ed342 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Aug 28 2023 07:29:18 +0000
Subject: [PATCH 1/2] Log entries blocking directory removal


Related: https://pagure.io/koji/issue/3755

---

diff --git a/koji/util.py b/koji/util.py
index f3e5dce..f086590 100644
--- a/koji/util.py
+++ b/koji/util.py
@@ -515,6 +515,10 @@ def _rmtree(dev, logger):
                 # For now, we ignore this and proceed, but we'll still fail at
                 # the top level rmdir
                 logger.error("Unable to remove directory %s: %s" % (empty_dir, e))
+                if e.errno == errno.ENOTEMPTY:
+                    # try to find what is there (it could be deleted meanwhile, so it could
+                    # be empty)
+                    logger.error("Found these entries: %s", ', '.join(os.listdir()))
                 pass
 
         if not dirs:

From 5278af7a4cb4b0d62c4f6878ad6b61bec882a9b7 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Oct 02 2023 14:21:07 +0000
Subject: [PATCH 2/2] additional place to log


---

diff --git a/koji/util.py b/koji/util.py
index f086590..ad2206a 100644
--- a/koji/util.py
+++ b/koji/util.py
@@ -475,6 +475,10 @@ def rmtree(path, logger=None):
     try:
         os.rmdir(path)
     except OSError as e:
+        if e.errno == errno.ENOTEMPTY:
+            # try to find what is there (it could be deleted meanwhile, so it could
+            # be empty)
+            logger.error("Found these entries: %s", ', '.join(os.listdir(path)))
         if e.errno != errno.ENOENT:
             raise
 
@@ -518,7 +522,7 @@ def _rmtree(dev, logger):
                 if e.errno == errno.ENOTEMPTY:
                     # try to find what is there (it could be deleted meanwhile, so it could
                     # be empty)
-                    logger.error("Found these entries: %s", ', '.join(os.listdir()))
+                    logger.error("Found these entries: %s", ', '.join(os.listdir(empty_dir)))
                 pass
 
         if not dirs: