Correctly install overridden packages without cache.

Author: fangerer

com.oracle.truffle.r.test.packages/r/install.cache.R

@@ -712,21 +712,36 @@ transitive.dependencies <- function(pkg, lib, pl = as.data.frame(available.packa
 
 pkg.cache.in.overrides <- function(pkgname) pkgname %in% (if(is.fastr()) overrides$fastr else overrides$gnur)
 
+pkg.cache.full.install <- function(install.candidate.names, contriburl, lib.install) {
+    # separate uncached packages that are listed in 'overrides'
+    pkgs.in.overrides <- as.character(install.candidate.names[pkg.cache.in.overrides(install.candidate.names)])
+    pkgs.not.in.overrides <- as.character(install.candidate.names[!pkg.cache.in.overrides(install.candidate.names)])
+
+    # override packages need to be installed differently
+    if (length(pkgs.in.overrides) > 0) {
+        install.fastr.packages(as.character(pkgs.in.overrides), lib=lib.install, INSTALL_opts="--install-tests")
+    }
+
+    if (length(pkgs.not.in.overrides) > 0) {
+        install.packages(as.character(pkgs.not.in.overrides), contriburl=contriburl, type="source", lib=lib.install, INSTALL_opts="--install-tests")
+    }
+}
+
 # Fetches the package from the cache or installs it. This is also done for all transitive dependencies.
 pkg.cache.internal.install <- function(pkg.cache.env, pkgname, contriburl, lib.install) {
     tryCatch({
-        if (pkg.cache.is.enabled(pkg.cache.env)) {
-            # determine available packages
-            pkg.list <- as.data.frame(available.packages(contriburl=contriburl, filters=list(add=TRUE, function(x) x), stringAsFactors=FALSE))
+        # determine available packages
+        pkg.list <- as.data.frame(available.packages(contriburl=contriburl, filters=list(add=TRUE, function(x) x), stringAsFactors=FALSE))
 
-            # query version of the package
-            pkg <- pkg.list[pkgname, c("Package", "Version")]
+        # query version of the package
+        pkg <- pkg.list[pkgname, c("Package", "Version")]
 
-            # compute transitive dependencies of the package to install
-            log.message("Computing transitive package dependencies for ", paste0(pkgname, "_", as.character(pkg$Version)), level=1)
-            transitive.pkg.list <- rbind(transitive.dependencies(pkgname, lib=lib.install, pl=pkg.list), pkg)
-            log.message("transitive deps: ", as.character(transitive.pkg.list$Package), level=1)
+        # compute transitive dependencies of the package to install
+        log.message("Computing transitive package dependencies for ", paste0(pkgname, "_", as.character(pkg$Version)), level=1)
+        transitive.pkg.list <- rbind(transitive.dependencies(pkgname, lib=lib.install, pl=pkg.list), pkg)
+        log.message("transitive deps: ", as.character(transitive.pkg.list$Package), level=1)
 
+        if (pkg.cache.is.enabled(pkg.cache.env)) {
             # apply pkg cache to fetch cached packages first
             cached.pkgs <- apply(transitive.pkg.list, 1, function(pkg) pkg.cache.get(pkg.cache.env, pkg, lib.install))
             log.message("Number of uncached packages:", nrow(transitive.pkg.list[!cached.pkgs, ]), level=1)
@@ -736,29 +751,17 @@ pkg.cache.internal.install <- function(pkg.cache.env, pkgname, contriburl, lib.i
                 # install the package (and the transitive dependencies implicitly)
                 uncached.pkg.names <- transitive.pkg.list[!cached.pkgs, "Package"]
 
-                # separate uncached packages that are listed in 'overrides'
-                pkgs.in.overrides <- as.character(uncached.pkg.names[pkg.cache.in.overrides(uncached.pkg.names)])
-                pkgs.not.in.overrides <- as.character(uncached.pkg.names[!pkg.cache.in.overrides(uncached.pkg.names)])
-
-                # override packages need to be installed differently
-                if (length(pkgs.in.overrides) > 0) {
-                    install.fastr.packages(as.character(pkgs.in.overrides), lib=lib.install, INSTALL_opts="--install-tests")
-                }
-
-                if (length(pkgs.not.in.overrides) > 0) {
-                    install.packages(as.character(pkgs.not.in.overrides), contriburl=contriburl, type="source", lib=lib.install, INSTALL_opts="--install-tests")
-                }
+                # install uncached packages
+                pkg.cache.full.install(uncached.pkg.names, contriburl, lib.install)
 
                 # cache packages that were not in the cache before
                 log.message("Caching uncached dependencies:", as.character(transitive.pkg.list[!cached.pkgs, "Package"]), level=1)
                 apply(transitive.pkg.list[!cached.pkgs, ], 1, function(pkg) pkg.cache.insert(pkg.cache.env, pkg, lib.install))
             }
         } else {
-            if (pkg.cache.in.overrides(pkgname)) {
-                install.fastr.packages(pkgname, lib=lib.install, INSTALL_opts="--install-tests")
-            } else {
-                install.packages(pkgname, contriburl=contriburl, type="source", lib=lib.install, INSTALL_opts="--install-tests")
-            }
+            # Even if we do not use the package cache, we need to compute the dependencies transitively 
+            # because the deps may contain overridden packages.
+            pkg.cache.full.install(transitive.pkg.list[, "Package"], contriburl, lib.install)
         }
 
         # if we reach here, installation was a success