Updated embedded pkgcache

DESCRIPTION

@@ -66,7 +66,7 @@ Config/needs/dependencies:
     filelock,
     jsonlite,
     pkgbuild,
-    r-lib/pkgcache,
+    pkgcache,
     r-lib/pkgdepends,
     pkgsearch,
     processx,

src/library/pkgcache/DESCRIPTION

@@ -1,6 +1,6 @@
 Package: pkgcache
 Title: Cache 'CRAN'-Like Metadata and R Packages
-Version: 2.2.0.9000
+Version: 2.2.1
 Authors@R: c(
     person("Gábor", "Csárdi", , "[email protected]", role = c("aut", "cre")),
     person("Posit Software, PBC", role = c("cph", "fnd"))
@@ -9,8 +9,8 @@ Description: Metadata and package cache for CRAN-like repositories.  This
     is a utility package to be used by package management tools that want
     to take advantage of caching.
 License: MIT + file LICENSE
-URL: https://github.com/r-lib/pkgcache#readme,
-        https://r-lib.github.io/pkgcache/
+URL: https://r-lib.github.io/pkgcache/,
+        https://github.com/r-lib/pkgcache
 BugReports: https://github.com/r-lib/pkgcache/issues
 Depends: R (>= 3.4)
 Imports: callr (>= 2.0.4.9000), cli (>= 3.2.0), curl (>= 3.2),
@@ -22,10 +22,11 @@ Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
 Encoding: UTF-8
 Language: en-US
-Roxygen: list(markdown = TRUE, r6 = FALSE)
 RoxygenNote: 7.2.3
 NeedsCompilation: yes
-Packaged: 2023-11-21 14:59:49 UTC; gaborcsardi
+Packaged: 2023-12-10 12:57:09 UTC; gaborcsardi
 Author: Gábor Csárdi [aut, cre],
   Posit Software, PBC [cph, fnd]
 Maintainer: Gábor Csárdi <[email protected]>
+Repository: CRAN
+Date/Publication: 2023-12-10 13:20:02 UTC

src/library/pkgcache/NEWS.md

@@ -1,4 +1,7 @@
-# pkgcache (development version)
+# pkgcache 2.2.1
+
+* pkgcache now does a better job when matching the R version to a
+  Bioconductor version.
 
 # pkgcache 2.2.0
 

src/library/pkgcache/R/bioc.R

@@ -300,7 +300,7 @@ bioconductor <- local({
   }
 
   .VERSION_SENTINEL <- local({
-    version <- package_version(list())
+    version <- package_version(character())
     class(version) <- c("unknown_version", class(version))
     version
   })

src/library/pkgcache/R/metadata-cache.R

@@ -267,8 +267,6 @@ cranlike_metadata_cache <- R6Class(
   )
 )
 
-#' @importFrom filelock lock unlock
-
 cmc_init <- function(self, private, primary_path, replica_path, platforms,
                      r_version, bioc, cran_mirror, repos, update_after) {
 

src/library/pkgcache/R/package-cache.R

@@ -89,7 +89,6 @@
 #' `pc$delete()` deletes the file(s) from the cache.
 #'
 #' @importFrom R6 R6Class
-#' @importFrom filelock lock unlock
 #'
 #' @export
 #' @examples

src/library/pkgcache/src/errors.c

@@ -86,7 +86,7 @@ SEXP r_throw_system_error(const char *func, const char *filename, int line,
   va_start(args, msg);
   vsnprintf(errorbuf, ERRORBUF_SIZE, msg, args);
   va_end(args);
-  error("%s (system error %d, %s) @%s:%d (%s)", errorbuf, errorcode,
+  error("%s (system error %ld, %s) @%s:%d (%s)", errorbuf, errorcode,
         realsysmsg, filename, line, func);
   return R_NilValue;
 }