mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/cli): correctly trim cppnix output in NixCompatIO

Browse source 
We only stripped one of the two uses of this string, leading to
extraneous newlines in the refscanner.

Change-Id: I25d9119be082c487352f0cf66b97ecdcc3e1de06
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7932
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2023-01-26 13:17:59 +03:00 committed by tazjin
parent daa3721f73
commit 2e66f7da92
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tvix/cli/src/nix_compat.rs
View file

@ -78,17 +78,18 @@ impl NixCompatIO {
if !out.status.success() {
return Err(io::Error::new(
io::ErrorKind::Other,
String::from_utf8_lossy(&out.stderr),
String::from_utf8_lossy(&out.stderr).trim().to_owned(),
));
}
let out_path_str = String::from_utf8(out.stdout)
.map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
let out_path_trimmed = out_path_str.trim();
self.known_paths.borrow_mut().plain(&out_path_str);
self.known_paths.borrow_mut().plain(out_path_trimmed);
let mut out_path = PathBuf::new();
out_path.push(out_path_str.trim());
out_path.push(out_path_trimmed);
Ok(out_path)
}
}