diff --git a/NEWS.md b/NEWS.md index a5a1a28a..2db2af81 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # remotes (development version) +* Credentials are no longer passed to dependencies, as this breaks dependencies + which use different credentials or hosts. If you have relied on this behavior + a more robust way to provide the credentials is using the appropriate + environment variables, e.g. `GITHUB_PAT`, `BITBUCKET_USER` etc. + (@antoine-sachet, #345). * The hash of bitbucket hosts is now correctly retrieved (@antoine-sachet, #344) # remotes 2.0.3 diff --git a/R/deps.R b/R/deps.R index 25643898..7f4d0c48 100644 --- a/R/deps.R +++ b/R/deps.R @@ -117,7 +117,7 @@ local_package_deps <- function(pkgdir = ".", dependencies = NA) { dev_package_deps <- function(pkgdir = ".", dependencies = NA, repos = getOption("repos"), - type = getOption("pkgType"), ...) { + type = getOption("pkgType")) { pkg <- load_pkg_description(pkgdir) repos <- c(repos, parse_additional_repositories(pkg)) @@ -135,7 +135,7 @@ dev_package_deps <- function(pkgdir = ".", dependencies = NA, combine_deps( package_deps(deps, repos = repos, type = type), - remote_deps(pkg, ...)) + remote_deps(pkg)) } combine_deps <- function(cran_deps, remote_deps) { @@ -500,13 +500,13 @@ split_remotes <- function(x) { } -remote_deps <- function(pkg, ...) { +remote_deps <- function(pkg) { if (!has_dev_remotes(pkg)) { return(NULL) } dev_packages <- split_remotes(pkg[["remotes"]]) - remote <- lapply(dev_packages, parse_one_remote, ...) + remote <- lapply(dev_packages, parse_one_remote) package <- vapply(remote, function(x) remote_package_name(x), character(1), USE.NAMES = FALSE) installed <- vapply(package, function(x) local_sha(x), character(1), USE.NAMES = FALSE) diff --git a/R/install.R b/R/install.R index 60437239..8c26c473 100644 --- a/R/install.R +++ b/R/install.R @@ -21,7 +21,7 @@ install <- function(pkgdir, dependencies, quiet, build, build_opts, upgrade, } install_deps(pkgdir, dependencies = dependencies, quiet = quiet, - build = build, build_opts = build_opts, upgrade = upgrade, repos = repos, type = type, ...) + build = build, build_opts = build_opts, upgrade = upgrade, repos = repos, type = type) if (isTRUE(build)) { dir <- tempfile() @@ -163,15 +163,12 @@ install_deps <- function(pkgdir = ".", dependencies = NA, upgrade = c("default", "ask", "always", "never"), quiet = FALSE, build = TRUE, - build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes"), - ...) { - + build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes")) { packages <- dev_package_deps( pkgdir, repos = repos, dependencies = dependencies, - type = type, - ... + type = type ) dep_deps <- if (isTRUE(dependencies)) NA else dependencies @@ -182,8 +179,7 @@ install_deps <- function(pkgdir = ".", dependencies = NA, quiet = quiet, upgrade = upgrade, build = build, - build_opts = build_opts, - ... + build_opts = build_opts ) } diff --git a/man/install_deps.Rd b/man/install_deps.Rd index c643d950..efa5cbb0 100644 --- a/man/install_deps.Rd +++ b/man/install_deps.Rd @@ -8,7 +8,7 @@ install_deps(pkgdir = ".", dependencies = NA, repos = getOption("repos"), type = getOption("pkgType"), upgrade = c("default", "ask", "always", "never"), quiet = FALSE, build = TRUE, build_opts = c("--no-resave-data", "--no-manual", - "--no-build-vignettes"), ...) + "--no-build-vignettes")) } \arguments{ \item{pkgdir}{path to a package directory, or to a package tarball.} diff --git a/man/package_deps.Rd b/man/package_deps.Rd index ff515222..ba2ea1f8 100644 --- a/man/package_deps.Rd +++ b/man/package_deps.Rd @@ -13,7 +13,7 @@ package_deps(packages, dependencies = NA, repos = getOption("repos"), local_package_deps(pkgdir = ".", dependencies = NA) dev_package_deps(pkgdir = ".", dependencies = NA, - repos = getOption("repos"), type = getOption("pkgType"), ...) + repos = getOption("repos"), type = getOption("pkgType")) \method{update}{package_deps}(object, dependencies = NA, upgrade = c("default", "ask", "always", "never"), force = FALSE, @@ -39,8 +39,6 @@ just check this package, not its dependencies).} \item{pkgdir}{path to a package directory, or to a package tarball.} -\item{...}{Additional arguments passed to \code{install_packages}.} - \item{object}{A \code{package_deps} object.} \item{upgrade}{One of "default", "ask", "always", or "never". "default" @@ -59,6 +57,8 @@ since the previous install.} \item{build_opts}{Options to pass to \code{R CMD build}, only used when \code{build} is \code{TRUE}.} + +\item{...}{Additional arguments passed to \code{install_packages}.} } \value{ A \code{data.frame} with columns: