Merge pull request #220 from CybercentreCanada/bugfix/rmdir_nonempty_…

…directory Fix rmdir on non-empty dir
CybercentreCanada · Jan 7, 2025 · 33ad10f · 33ad10f
2 parents f3b7390 + 57cbd7f
commit 33ad10f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/overpower/overpower.py b/overpower/overpower.py
@@ -565,8 +565,10 @@ def _prepare_artifacts(self, request: ServiceRequest, worth_extracting: bool = T
         for root, dirs, _ in walk(getcwd()):
             for d in dirs:
                 dir_path = path.join(root, d)
-                if len(listdir(dir_path)) == 0:
-                    rmdir(dir_path)
+                try:
+                    rmdir(dir_path)  # Non-empty dir raises OSError
+                except OSError:
+                    pass
 
         # Retrieve artifacts
         for root, _, files in walk(self.working_directory):