summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2025-01-29 12:46:06 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2025-02-05 12:04:16 +0100
commit94ae6cc7e4d2a46057130bf4cead1e86e226d5b1 (patch)
tree0371a3546683d1015641f2a01c22fd1e629f038d
parent4fa29293c42891f7398f7974c2a588cdca9dc472 (diff)
downloadjustbuild-94ae6cc7e4d2a46057130bf4cead1e86e226d5b1.tar.gz
garbage collection: remove garbage recursively
When garbage collecting the oldest generation, we expect it to be a non-empty directory. Therefore, remove it recursively. (cherry-picked from 48c2382218a5af10177e68ba24091e77f1e045e6)
-rw-r--r--src/buildtool/storage/repository_garbage_collector.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/buildtool/storage/repository_garbage_collector.cpp b/src/buildtool/storage/repository_garbage_collector.cpp
index 67a08f9f..e21ca19a 100644
--- a/src/buildtool/storage/repository_garbage_collector.cpp
+++ b/src/buildtool/storage/repository_garbage_collector.cpp
@@ -55,7 +55,8 @@ auto RepositoryGarbageCollector::TriggerGarbageCollection(
return false;
}
if (FileSystemManager::IsDirectory(remove_me)) {
- if (not FileSystemManager::RemoveDirectory(remove_me)) {
+ if (not FileSystemManager::RemoveDirectory(remove_me,
+ /*recursively=*/true)) {
Logger::Log(LogLevel::Error,
"Failed to remove directory {}",
remove_me.string());
@@ -107,7 +108,8 @@ auto RepositoryGarbageCollector::TriggerGarbageCollection(
return false;
}
if (FileSystemManager::IsDirectory(remove_me)) {
- if (not FileSystemManager::RemoveDirectory(remove_me)) {
+ if (not FileSystemManager::RemoveDirectory(remove_me,
+ /*recursively=*/true)) {
Logger::Log(LogLevel::Error,
"Failed to remove directory {}",
remove_me.string());