Always pass ALLOW_INSECURE to MoreFiles.deleteRecursively
If ALLOW_INSECURE is not set, it fails on OSX with:
unable to guarantee security of recursive delete
See change Ic0894b88e for previous fix.
Change-Id: I0e323230542174a14c5d2038df838052af6fc5be
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemover.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemover.java
index ec6c29a..4cbf83b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemover.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemover.java
@@ -14,6 +14,7 @@
package com.googlesource.gerrit.plugins.deleteproject.fs;
+import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -102,7 +103,7 @@
private void cleanUpOverdueRepositories() {
for (Path path : listOverdueFiles(config.getArchiveDuration())) {
try {
- MoreFiles.deleteRecursively(path);
+ MoreFiles.deleteRecursively(path, ALLOW_INSECURE);
} catch (IOException e) {
logger.warn("Error trying to clean the archived git repository: {}", path, e);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java
index b1a1c74..003f154 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java
@@ -103,7 +103,7 @@
Path basePath = getBasePath(repoPath, projectName);
Path trash = renameRepository(repoPath, basePath, projectName, "deleted");
try {
- MoreFiles.deleteRecursively(trash);
+ MoreFiles.deleteRecursively(trash, ALLOW_INSECURE);
recursivelyDeleteEmptyParents(repoPath.toFile().getParentFile(), basePath.toFile());
} catch (IOException e) {
// Only log if delete failed - repo already moved to trash.
