Skip to content

Commit b9091cc

Browse files
authored
Merge pull request #783 from maksymiuks/main
Add additional_repositories to dev_package_deps
2 parents 6fe8836 + b839583 commit b9091cc

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

NEWS.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
* Remotes field accepts explicit package names: `<pkgname>=<type>::<username>/<repo>` (#719, @heavywatal).
77
* Add `remote_precedence` parameter to `dev_package_deps()` which allows user to choose whether
88
remote sources should have a priority over cran sources. (#732, @maksymiuks)
9-
109
* `dev_package_deps()` now works for packages with `Enhances` dependencies
1110
(#711, @maksymiuks).
11+
* Add `additional_repositories` parameter to `dev_package_deps()` which allows user to choose whether
12+
`Additional_repositories` should be extracted from the `DESCRIPTION` file and appended
13+
to repos. (#782, @maksymiuks)
1214

1315
# remotes 2.4.2
1416

R/deps.R

+5-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
#' @param type Type of package to `update`.
3535
#' @param remote_precedence A logical flag specifying whether remote sources should take precedence over
3636
#' CRAN when both were found.
37+
#' @param additional_repositories A logical flag specifying whether `Additional_repositories` should
38+
#' be extracted from the DESCRIPTION and appended to `repos`.
3739
#' @param object A `package_deps` object.
3840
#' @param ... Additional arguments passed to `install_packages`.
3941
#' @inheritParams install_github
@@ -124,10 +126,11 @@ local_package_deps <- function(pkgdir = ".", dependencies = NA) {
124126
dev_package_deps <- function(pkgdir = ".", dependencies = NA,
125127
repos = getOption("repos"),
126128
type = getOption("pkgType"),
127-
remote_precedence = TRUE) {
129+
remote_precedence = TRUE,
130+
additional_repositories = TRUE) {
128131

129132
pkg <- load_pkg_description(pkgdir)
130-
repos <- c(repos, parse_additional_repositories(pkg))
133+
repos <- c(repos, if (additional_repositories) parse_additional_repositories(pkg))
131134

132135
deps <- local_package_deps(pkgdir = pkgdir, dependencies = dependencies)
133136

man/package_deps.Rd

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)