From b722f804a751ed53cddcedcfa0510fbb00401366 Mon Sep 17 00:00:00 2001 From: Jim Hester Date: Thu, 26 Sep 2019 11:52:58 -0400 Subject: [PATCH] Allow dev_sitrep to run outside a package directory Fixes #2127 --- NEWS.md | 1 + R/sitrep.R | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index b71dcfce4..863e10ff3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ # devtools (development version) +* `dev_sitrep()` now works if run outside a package directory (#2127). * `release()` now works if the package root is not in the working directory. # devtools 2.2.1 diff --git a/R/sitrep.R b/R/sitrep.R index 216d0627a..22707d700 100644 --- a/R/sitrep.R +++ b/R/sitrep.R @@ -69,7 +69,7 @@ r_release <- memoise::memoise(.r_release) #' dev_sitrep() #' } dev_sitrep <- function(pkg = ".", debug = FALSE) { - pkg <- as.package(pkg) + pkg <- tryCatch(as.package(pkg), error = function(e) NULL) has_build_tools <- !is_windows || pkgbuild::has_build_tools(debug = debug) @@ -83,7 +83,7 @@ dev_sitrep <- function(pkg = ".", debug = FALSE) { rtools_path = if (has_build_tools) pkgbuild::rtools_path(), devtools_version = packageVersion("devtools"), devtools_deps = remotes::package_deps("devtools", dependencies = NA), - pkg_deps = remotes::dev_package_deps(pkg$path, dependencies = TRUE), + pkg_deps = if (!is.null(pkg)) { remotes::dev_package_deps(pkg$path, dependencies = TRUE) }, rstudio_version = if (rstudioapi::isAvailable()) rstudioapi::getVersion(), rstudio_msg = check_for_rstudio_updates() ),