From 9d54ed02a8752eb0f1f0d38df785681a958ce889 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 25 Mar 2023 11:21:39 +0100 Subject: [PATCH] ln -i: adjust the behavior to match the GNU change Just like mv & cp Matches the change upstream 7a69df88999bedd8e9fccf9f3dfa9ac6907fab66 --- src/uu/ln/src/ln.rs | 2 +- tests/by-util/test_ln.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index c583aac1e..94117d0ed 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -392,7 +392,7 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> UResult<()> { OverwriteMode::NoClobber => {} OverwriteMode::Interactive => { if !prompt_yes!("overwrite {}?", dst.quote()) { - return Ok(()); + return Err(LnError::SomeLinksFailed.into()); } if fs::remove_file(dst).is_ok() {}; diff --git a/tests/by-util/test_ln.rs b/tests/by-util/test_ln.rs index 0f7241445..3be07c4d7 100644 --- a/tests/by-util/test_ln.rs +++ b/tests/by-util/test_ln.rs @@ -116,7 +116,7 @@ fn test_symlink_interactive() { .ucmd() .args(&["-i", "-s", file, link]) .pipe_in("n") - .succeeds() + .fails() .no_stdout(); assert!(at.file_exists(file));