remote: Fix `detect_can_exec` detection (#42087)
Lukas Wirth
created
Closes https://github.com/zed-industries/zed/issues/42036
Release Notes:
- Fixed an issuer with wsl exec detection eagerly failing, breaking
remote connections
Change summary
crates/remote/src/transport/wsl.rs | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
Detailed changes
@@ -98,21 +98,10 @@ impl WslRemoteConnection {
let args = &["-m"];
let output = wsl_command_impl(options, &program, args, true)
.output()
- .await?;
-
- if !output.status.success() {
- let output = wsl_command_impl(options, &program, args, false)
- .output()
- .await?;
-
- if !output.status.success() {
- return Err(anyhow!(
- "Command '{}' failed: {}",
- program,
- String::from_utf8_lossy(&output.stderr).trim()
- ));
- }
+ .await;
+ if !output.is_ok_and(|output| output.status.success()) {
+ run_wsl_command_impl(options, &program, args, false).await?;
Ok(false)
} else {
Ok(true)