From badc6c7ab30bb4c39d07acf9c39aba8c83d36567 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 17 Nov 2017 15:52:49 +0100
Subject: [PATCH] Implemented link option to use a sym link instead of copying.
---
.../r/install.packages.R | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/com.oracle.truffle.r.test.packages/r/install.packages.R b/com.oracle.truffle.r.test.packages/r/install.packages.R
index 6de5ec8176..9defe9395c 100644
--- a/com.oracle.truffle.r.test.packages/r/install.packages.R
+++ b/com.oracle.truffle.r.test.packages/r/install.packages.R
@@ -780,11 +780,11 @@ pkg.cache.get <- function(pkgname, lib) {
toPath <- lib
# copy from cache to package library
- if(!file.copy(fromPath, toPath, recursive=TRUE)) {
- log.message("could not copy package dir from ", fromPath , " to ", toPath, level=1)
+ if(!pkg.cache.import.dir(fromPath, toPath)) {
+ log.message("could not copy/link package dir from ", fromPath , " to ", toPath, level=1)
return (FALSE)
}
- log.message("pacakge cache hit, using package from ", fromPath)
+ log.message("package cache hit, using package from ", fromPath)
return (TRUE)
}
log.message("cache miss for package ", pkgname, level=1)
@@ -792,6 +792,14 @@ pkg.cache.get <- function(pkgname, lib) {
FALSE
}
+pkg.cache.import.dir <- function(fromPath, toPath) {
+ if (any(as.logical(pkg.cache$link), na.rm=T)) {
+ file.symlink(fromPath, toPath)
+ } else {
+ file.copy(fromPath, toPath, recursive=TRUE)
+ }
+}
+
pkg.cache.insert <- function(pkgname, lib) {
# check if caching is enabled
if (!pkg.cache$enabled) {
@@ -884,7 +892,7 @@ pkg.cache.init <- function(cache.dir, version) {
version.table.name <- file.path(cache.dir, pkg.cache$table.file.name)
# create package lib dir for this version (if not existing)
- version.table <- pkg.cache.create.version(cache.dir, version, data.frame(row.names=c("version","dir","ctime")))
+ version.table <- pkg.cache.create.version(cache.dir, version, data.frame(version=character(0),dir=character(0),ctime=double(0)))
tryCatch({
write.csv(version.table, version.table.name, row.names=FALSE)
}, error = function(e) {
@@ -1256,7 +1264,7 @@ run <- function() {
quiet <- F
repo.list <- c("CRAN")
-pkg.cache <- as.environment(list(enabled=FALSE, table.file.name="version.table", size=2L))
+pkg.cache <- as.environment(list(enabled=FALSE, table.file.name="version.table", size=2L,link=FALSE))
cran.mirror <- NA
blacklist.file <- NA
initial.blacklist.file <- NA
--
GitLab