aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/sandbox
diff options
context:
space:
mode:
authorGravatar Adam Michael <ajmichael@google.com>2017-03-02 14:59:21 +0000
committerGravatar Yue Gan <yueg@google.com>2017-03-03 10:35:47 +0000
commitacdd43bf8832db562312c6b273687dd6f1d219b7 (patch)
treed384284c057790a4be281de70bc33c6eeb1d836b /src/main/java/com/google/devtools/build/lib/sandbox
parent14b53897b499da457e26aa779c3b63c85838f204 (diff)
Make HardlinkedExecRoot correctly mount empty directory inputs.
Fixes #2597 -- PiperOrigin-RevId: 148999160 MOS_MIGRATED_REVID=148999160
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox')
-rw-r--r--src/main/java/com/google/devtools/build/lib/sandbox/HardlinkedExecRoot.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/HardlinkedExecRoot.java b/src/main/java/com/google/devtools/build/lib/sandbox/HardlinkedExecRoot.java
index 5bf7c4fd92..ceace7ae4f 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/HardlinkedExecRoot.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/HardlinkedExecRoot.java
@@ -149,6 +149,9 @@ public class HardlinkedExecRoot implements SandboxExecRoot {
java.nio.file.Files.createLink(targetNio, sourceNio);
// Directory
} else if (source.isDirectory()) {
+ // Eagerly create target directory in case source is an empty directory.
+ FileSystemUtils.createDirectoryAndParents(target);
+
Collection<Path> subpaths = source.getDirectoryEntries();
for (Path sourceSubpath : subpaths) {
Path targetSubpath = target.getRelative(sourceSubpath.relativeTo(source));