Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't stop loading the env if direnv call fails (#18473)

Browse source 
Before this we we would stop loading the environment if the call to
direnv failed, which is not necessary in any way
cc @mrnugget

Release Notes:

- Fixed the environment not loading if `direnv` mode is set to `direct`
and `.envrc` is not allowed
This commit is contained in:
Stanislav Alekseev 2024-09-30 09:54:22 +03:00 • committed by GitHub
parent e39695bf1c
commit 5b40debb5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/project/src/environment.rs
View file

@ -198,8 +198,9 @@ async fn load_shell_environment(
anyhow::ensure!( anyhow::ensure!(
direnv_output.status.success(), direnv_output.status.success(),
"direnv exited with error {:?}", "direnv exited with error {:?}. Stderr:\n{}",
direnv_output.status direnv_output.status,
String::from_utf8_lossy(&direnv_output.stderr)
); );
let output = String::from_utf8_lossy(&direnv_output.stdout); let output = String::from_utf8_lossy(&direnv_output.stdout);
@ -214,7 +215,7 @@ async fn load_shell_environment(
let direnv_environment = match load_direnv { let direnv_environment = match load_direnv {
DirenvSettings::ShellHook => None, DirenvSettings::ShellHook => None,
DirenvSettings::Direct => load_direnv_environment(dir).await?, DirenvSettings::Direct => load_direnv_environment(dir).await.log_err().flatten(),
} }
.unwrap_or(HashMap::default()); .unwrap_or(HashMap::default());