Skip to content

Commit 602ee06

Browse files
committed
Also get deps from current version
Fixes #3
1 parent 61c486a commit 602ee06

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

rechecktools/R/ci.R

+9-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ install_recheck_deps <- function(path = '.', which = 'strong'){
99
oldrepos <- enable_all_repos()
1010
oldtimeout <- options(timeout = 600)
1111
on.exit(options(c(oldrepos, oldtimeout)), add = TRUE)
12-
desc <- read.dcf(file.path(path, 'DESCRIPTION'))
13-
pkg <- desc[[1, 'Package']]
12+
desc <- as.data.frame(read.dcf(file.path(path, 'DESCRIPTION')))
13+
pkg <- desc$Package
1414
cranrepo <- getOption('repos')['CRAN']
1515
cran <- utils::available.packages(repos = cranrepo)
16-
packages <- c(pkg, tools::package_dependencies(pkg, db = cran, which = which, reverse = TRUE)[[pkg]])
16+
crandeps <- tools::package_dependencies(pkg, db = cran, which = which, reverse = TRUE)[[pkg]]
17+
packages <- unique(c(desc_deps(desc), crandeps))
1718
if(grepl("Linux", Sys.info()[['sysname']])){
1819
preinstall_linux_binaries(packages)
1920
} else {
@@ -22,3 +23,8 @@ install_recheck_deps <- function(path = '.', which = 'strong'){
2223
update.packages(oldPkgs = deps, ask = FALSE)
2324
}
2425
}
26+
27+
desc_deps <- function(desc){
28+
deps <- c(desc$Package, desc$Depends, desc$Imports, desc$LinkingTo, desc$Suggests, desc$Enhances)
29+
unique(trimws(sub("\\(.*\\)", "", unlist(strsplit(as.character(deps), ',')))))
30+
}

0 commit comments

Comments
 (0)