s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't crash if we can't canonicalise the path.

Browse source
This commit is contained in:
r-vdp 2023-05-16 18:32:48 +02:00
parent 3009a5feaf
commit 779ba9c7a7
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -43,7 +43,7 @@ impl TryFrom<PathBuf> for StorePath {
type Error = anyhow::Error; type Error = anyhow::Error;
fn try_from(path: PathBuf) -> Result<Self> { fn try_from(path: PathBuf) -> Result<Self> {
let canon = path.canonicalize()?; let canon = path.canonicalize().unwrap_or(path.clone());
if !canon.starts_with(PathBuf::from("/").join("nix").join("store")) { if !canon.starts_with(PathBuf::from("/").join("nix").join("store")) {
anyhow::bail!( anyhow::bail!(
"Error constructing store path, not in store: {} (canonicalised: {})", "Error constructing store path, not in store: {} (canonicalised: {})",