From 9a331f61a9340bc30a7512c71f1f3c6293bf5ea7 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Mon, 14 Mar 2016 16:00:16 -0700
Subject: [PATCH] remove jsonlite from package blacklist
---
com.oracle.truffle.r.test.cran/initial.package.blacklist | 3 ---
com.oracle.truffle.r.test.cran/r/install.cran.packages.R | 6 ++++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/com.oracle.truffle.r.test.cran/initial.package.blacklist b/com.oracle.truffle.r.test.cran/initial.package.blacklist
index 6d6712b188..961b6b9fe5 100644
--- a/com.oracle.truffle.r.test.cran/initial.package.blacklist
+++ b/com.oracle.truffle.r.test.cran/initial.package.blacklist
@@ -454,9 +454,6 @@ Reason: corebug
Package: lpSolve
Reason: corebug
-Package: jsonlite
-Reason: corebug
-
Package: XML
Reason: corebug
diff --git a/com.oracle.truffle.r.test.cran/r/install.cran.packages.R b/com.oracle.truffle.r.test.cran/r/install.cran.packages.R
index d2cc4e000b..ccc1d51db9 100644
--- a/com.oracle.truffle.r.test.cran/r/install.cran.packages.R
+++ b/com.oracle.truffle.r.test.cran/r/install.cran.packages.R
@@ -330,8 +330,10 @@ install.pkgs <- function(pkgnames, blacklist, dependents.install=F) {
} else {
if (!dependents.install && install.dependents) {
dependents <- install.order(avail.pkgs, avail.pkgs[pkgname, ])
- cat("installing dependents of:", pkgname, "\n")
- dependent.install.ok = install.pkgs(dependents, dependents.install=T, blacklist)
+ if (length(dependents) > 0) {
+ cat("installing dependents of:", pkgname, "\n")
+ dependent.install.ok = install.pkgs(dependents, dependents.install=T, blacklist)
+ }
}
if (dry.run) {
cat("would install:", pkgname, "\n")
--
GitLab