watchdog library path fixup

rstudio · Aug 14, 2023 · abe8125 · abe8125
1 parent f9b299d
commit abe8125
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/R/watchdog.R b/R/watchdog.R
@@ -88,9 +88,11 @@ renv_watchdog_start_impl <- function() {
   script <- renv_scope_tempfile("renv-watchdog-", fileext = ".R")
 
   # figure out library path -- need to dodge devtools::load_all()
-  library <- dirname(renv_namespace_path(.packageName))
-  if (!file.exists(file.path(library, "Meta/package.rds")))
-    library <- renv_libpaths_default()
+  nspath <- renv_namespace_path(.packageName)
+  library <- if (file.exists(file.path(nspath, "Meta/package.rds")))
+    dirname(nspath)
+  else
+    renv_libpaths_default()
 
   # for R CMD check
   name <- .packageName