cafkafk/seidr
cafkafk/seidr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(link): propagate canonicalization errors

Browse source 
Signed-off-by: Christina Sørensen <christina@cafkafk.com>
This commit is contained in:
Christina Sørensen 2023-10-17 07:04:27 +02:00
parent fe7c932c69
commit f17e2a5986
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/git.rs
View file

@ -172,10 +172,7 @@ impl From<std::io::Error> for LinkError {
fn handle_file_exists(selff: &Link, tx_path: &Path, rx_path: &Path) -> Result<bool, LinkError> { fn handle_file_exists(selff: &Link, tx_path: &Path, rx_path: &Path) -> Result<bool, LinkError> {
match rx_path.read_link() { match rx_path.read_link() {
Ok(file) Ok(file) if file.canonicalize()? == tx_path.canonicalize()? => {
if file.canonicalize().expect("failed to canonicalize file")
== tx_path.canonicalize().expect("failed to canonicalize path") =>
{
Err(LinkError::AlreadyLinked( Err(LinkError::AlreadyLinked(
tx_path.to_string_lossy().to_string(), tx_path.to_string_lossy().to_string(),
rx_path.to_string_lossy().to_string(), rx_path.to_string_lossy().to_string(),