Merge pull request #1851 from rstudio/uv-resolve-fix

t-kalinowski · web-flow · commit 85be77105408 · 2025-10-24T08:49:58.000-04:00
Fix internal `uv_binary()` resolution
diff --git a/R/py_require.R b/R/py_require.R
@@ -678,7 +678,9 @@ uv_binary <- function(bootstrap_install = TRUE) {
     }
   }
 
-  if (file.exists(uv)) uv else NULL # print visible
+  # if we bootstrap-installed successfully, return the path to the uv binary
+  # if not, reset `uv` for the on.exit() hook and return NULL visibly
+  if (file.exists(uv)) uv else (uv <- NULL)
 }
 
 uv_get_or_create_env <- function(packages = py_reqs_get("packages"),

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,9 @@ uv_binary <- function(bootstrap_install = TRUE) {`
`678`	`678`	`}`
`679`	`679`	`}`
`680`	`680`
`681`		`- if (file.exists(uv)) uv else NULL # print visible`
	`681`	`+ # if we bootstrap-installed successfully, return the path to the uv binary`
	`682`	+ # if not, reset `uv` for the on.exit() hook and return NULL visibly
	`683`	`+ if (file.exists(uv)) uv else (uv <- NULL)`
`682`	`684`	`}`
`683`	`685`
`684`	`686`	`uv_get_or_create_env <- function(packages = py_reqs_get("packages"),`