From 5f6a7f4dc4627103e73475293a369c53d26d9941 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Wed, 20 Sep 2017 15:13:45 +0200
Subject: [PATCH] correctly relativize directory in file.copy

---
 .../com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
index 4cd95cf8fc..acd936402b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
@@ -990,7 +990,7 @@ public class FileFunctions {
 
             @Override
             public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
-                Path newDir = toDir.resolve(fromDir.relativize(fromDir));
+                Path newDir = toDir.resolve(fromDir.relativize(dir));
                 try {
                     Files.copy(dir, newDir, copyOptions);
                 } catch (FileAlreadyExistsException x) {
-- 
GitLab