Fix #38 ref #8

gesistsa · Feb 13, 2023 · ad42783 · ad42783
1 parent 37e077f
commit ad42783
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/R/installation.R b/R/installation.R
@@ -43,7 +43,7 @@
     needed_pkgrefs <- dep$keys()
     ## install all terminal nodes
     for (pkgref in needed_pkgrefs) {
-        if(.is_github(pkgref)){
+        if(.is_github(pkgref)) {
           noncran_pkgrefs <- c(noncran_pkgrefs, pkgref)
           next()
         }
@@ -54,7 +54,7 @@
     while(length(setdiff(needed_pkgrefs, c(installed_pkgrefs, noncran_pkgrefs))) != 0) {
         for (pkgref in needed_pkgrefs) {
             ##print(package)
-            if (!pkgref %in% installed_pkgrefs & !pkgref %in% noncran_pkgrefs) {
+            if (!pkgref %in% installed_pkgrefs && !pkgref %in% noncran_pkgrefs) {
                 ## check requirement
                 requirement_fulfilled <- length(setdiff(dep$get(pkgref), installed_pkgrefs)) == 0
                 if (requirement_fulfilled) {

diff --git a/R/resolve.R b/R/resolve.R
@@ -158,7 +158,7 @@ NULL
     if (isTRUE(no_enhances)) {
         disabled_types <- c(disabled_types, "Enhances")
     }
-    res <- dep_df[!dep_df$type %in% disabled_types & dep_df$y != "R" & !(dep_df$y %in% c("datasets", "utils", "grDevices", "graphics", "stats", "methods", "tools", "grid", "splines", "Rgraphviz", "parallel", "stats4", "tcltk", "MASS", "nnet")),]
+    res <- dep_df[!dep_df$type %in% disabled_types & dep_df$y != "R" & !(dep_df$y %in% c("datasets", "utils", "grDevices", "graphics", "stats", "methods", "tools", "grid", "splines", "Rgraphviz", "parallel", "stats4", "tcltk", "MASS", "nnet", "class")),]
     if (nrow(res) == 0) {
         return(NULL)
     } else {

diff --git a/tests/testdata/issue38.RDS b/tests/testdata/issue38.RDS
diff --git a/tests/testthat/test_expost_rang.R b/tests/testthat/test_expost_rang.R
@@ -108,3 +108,8 @@ test_that("Docker R < 2.1", {
     rang_rio$r_version <- "2.0.0"
     expect_error(export_rang(rang_rio, path = temp_r))
 })
+
+test_that("issue #38", {
+    issue38 <- readRDS("../testdata/issue38.RDS")
+    expect_error(export_rang(issue38, tempfile(fileext = ".R")), NA)
+})