Do not try to delete an already deleted folder

Originally, the remove command tries to delete first the working
directory (if repository has one) and then the metadata directory.
However the metadata directory could be contained by the working
directory and thus already deleted when the second deletion is called.
In this case an IOException will be thrown, to indicate that the
metadata directory could not be deleted. The correction simply checks
that the metadata directory exists before trying to delete it.

Bug: 332262
Change-Id: I6f49db1c8e730ab3c10d35e2af0e4dc81b5a223c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java
index 35b5f01df0..2ab197c9dc 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java
@@ -167,8 +167,11 @@ public class RemoveCommand extends
 						for (RepositoryNode node : selectedNodes) {
 							Repository repo = node.getRepository();
 							if (!repo.isBare())
-								FileUtils.delete(repo.getWorkTree(), FileUtils.RECURSIVE | FileUtils.RETRY);
-							FileUtils.delete(repo.getDirectory(), FileUtils.RECURSIVE | FileUtils.RETRY);
+								FileUtils.delete(repo.getWorkTree(),
+										FileUtils.RECURSIVE | FileUtils.RETRY);
+							FileUtils.delete(repo.getDirectory(),
+									FileUtils.RECURSIVE | FileUtils.RETRY
+											| FileUtils.SKIP_MISSING);
 						}
 					} catch (IOException e) {
 						return Activator.createErrorStatus(e.getMessage(), e);