Fix RDS version for older versions of R #129

andrie · Nov 24, 2022 · 31a947a · 31a947a
1 parent c066e01
commit 31a947a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/R/makeRepo.R b/R/makeRepo.R
@@ -101,7 +101,15 @@ updateRepoIndex <- function(path, type = "source", Rversion = R.version) {
   n <- lapply(type, function(t) {
     pkgPath <- repoBinPath(path = path, type = t, Rversion = Rversion)
     if (grepl("mac.binary", t)) t <- "mac.binary"
+    # browser()
     write_packages(dir = pkgPath, type = t, r_version = Rversion)
+    if (twodigitRversion(Rversion) < "3.5.0") {
+      pfiles <- list.files(path = pkgPath, pattern = "PACKAGES.rds", recursive = TRUE, full.names = TRUE)
+      for (f in pfiles) {
+        pf <- readRDS(f)
+        saveRDS(pf, file = f, version = 2)
+      }
+    }
   })
   names(n) <- type
   n

diff --git a/R/utils.R b/R/utils.R
@@ -14,15 +14,7 @@ download_packages <- function(pkgs, destdir, available, repos, contriburl, type,
 # Thin wrapper around write_PACKAGES
 write_packages <- function(dir, type, r_version) {
   r_version <- twodigitRversion(r_version)
-  if (r_version >= "3.5.0") {
-    tools::write_PACKAGES(dir = dir, type = type) 
-  } else {
-    if (getRversion() >= "3.5.0") {
-      tools::write_PACKAGES(dir = dir, type = type, rds_compress = 2) 
-    } else {
-      tools::write_PACKAGES(dir = dir, type = type) 
-    }
-  }
+  tools::write_PACKAGES(dir = dir, type = type) 
 }
 
 
diff --git a/tests/testthat/helpers.R b/tests/testthat/helpers.R
@@ -82,9 +82,9 @@ mock_write_packages <- function(dir, type = "source", r_version) {
     rownames(db) <- db[, "Package"]
     r_version <- twodigitRversion(r_version)
     if (r_version >= "3.5.0") {
-      saveRDS(db, file.path(dir, "PACKAGES.rds"), compress = "xz")
+      saveRDS(db, file.path(dir, "PACKAGES.rds"))
     } else {
-      saveRDS(db, file.path(dir, "PACKAGES.rds"), compress = "xz", version = 2)
+      saveRDS(db, file.path(dir, "PACKAGES.rds"), version = 2)
     }
   }
   np