uv step: checking self subcommand exits; fixes #942 (#971)

* uv step: checking self subcommand exits; fixes #942 * uv: fixing return behavior --------- Co-authored-by: Lucas Parzianello <[email protected]>
topgrade-rs · Oct 29, 2024 · 39f76a3 · 39f76a3
1 parent f181a79
commit 39f76a3
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/steps/generic.rs b/src/steps/generic.rs
@@ -1032,15 +1032,20 @@ pub fn run_uv(ctx: &ExecutionContext) -> Result<()> {
     let uv_exec = require("uv")?;
     print_separator("uv");
 
-    ctx.run_type()
+    // try uv self --help first - if it succeeds, we call uv self update
+    let result = ctx
+        .run_type()
         .execute(&uv_exec)
-        .args(["self", "update"])
-        .status_checked()
-        .ok();
+        .args(["self", "--help"])
+        .output_checked();
 
-    // ignoring self-update errors, because they are likely due to uv's
-    // installation being managed by another package manager, in which
-    // case another step will handle the update.
+    if result.is_ok() {
+        ctx.run_type()
+            .execute(&uv_exec)
+            .args(["self", "update"])
+            .status_checked()
+            .ok();
+    }
 
     ctx.run_type()
         .execute(&uv_exec)