From ab4abc4728ed4b42bad335be52a53fdcb56bf421 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Fri, 4 Sep 2015 17:41:33 +0000 Subject: [PATCH] Rollback of commit 369635536db085dd70124ace2e4ef604680148b4. *** Reason for rollback *** Totally broke Bazel tests (100% failures!). Found by git bisect after running the update script. *** Original change description *** sandbox: We have to move all generated outputs, not just regular files. Fix for a part of bug #397. -- MOS_MIGRATED_REVID=102354724 --- .../devtools/build/lib/sandbox/NamespaceSandboxRunner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java index e16ac70e1c2c08..74649e615d7207 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java @@ -163,7 +163,9 @@ private void copyOutputs(Collection outputs) throws IOExc Path source = sandboxExecRoot.getRelative(output.getExecPathString()); Path target = execRoot.getRelative(output.getExecPathString()); FileSystemUtils.createDirectoryAndParents(target.getParentDirectory()); - Files.move(source.getPathFile(), target.getPathFile()); + if (source.isFile()) { + Files.move(new File(source.getPathString()), new File(target.getPathString())); + } } }