commit b2a61c28baeeff21df6cf35bde6c8b3a9ef85db5
author kchodorow <kchodorow@google.com> Mon Apr 03 22:03:25 2017 +0000
committer Marcel Hlopko <hlopko@google.com> Tue Apr 04 10:07:17 2017 +0200
tree 022c70483b3b1671c13fdf47b527277e5e621597
parent 686b2cb839bd42e061397b3901f1de94c08f893b

Remove all directories under the execroot during a clean

Now the actual workspace root might not be the basename of
the workspace, and everything should be removed anyway.

PiperOrigin-RevId: 152062690

src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
index 0a0cec5..2a92e42 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
@@ -225,8 +225,7 @@
       env.getBlazeWorkspace().clearCaches();
       // In order to be sure that we delete everything, delete the workspace directory both for
       // --deep_execroot and for --nodeep_execroot.
-      for (String directory : new String[] {
-          workspaceDirectory, "execroot/" + workspaceDirectory }) {
+      for (String directory : new String[] {workspaceDirectory, "execroot"}) {
         Path child = outputBase.getRelative(directory);
         if (child.exists()) {
           LOG.finest("Cleaning " + child + (cleanOptions.async ? " asynchronously..." : ""));