Skip to content

Commit cf9ad7f

Browse files
committed
Handle non-standard file name for sysreqs matching
Closes r-lib/pak#772.
1 parent 28b57af commit cf9ad7f

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

R/packages-gz.R

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,14 @@ read_packages_file <- function(
147147

148148
# fall back to previous version for filesize and sysreqs
149149
nameonly <- function(x) sub("_[^_]*$", "", x)
150-
map2 <- match(nameonly(pkgs$target), nameonly(metatarget))
150+
nameonly_metatarget <- nameonly(metatarget)
151+
map2 <- match(nameonly(pkgs$target), nameonly_metatarget)
152+
# handle the case when file names not package names, e.g. R Universe
153+
miss_sr <- is.na(map2)
154+
map2[miss_sr] <- match(
155+
pkgs$package[miss_sr],
156+
basename(nameonly_metatarget)
157+
)
151158
filesize2 <- meta$size[map2]
152159
sysreqs2 <- as.character(meta$sysreqs[map2])
153160
pkgs$filesize <- ifelse(is.na(pkgs$filesize), filesize2, pkgs$filesize)

0 commit comments

Comments
 (0)