From 0d5daacf9949d1f35604d4f16fbf0bf3dd16bd9a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 25 Mar 2023 10:47:57 +0100 Subject: [PATCH] mv -i: adjust the behavior to match the GNU change Matches the change upstream 7a69df88999bedd8e9fccf9f3dfa9ac6907fab66 --- src/uu/mv/src/mv.rs | 2 +- tests/by-util/test_mv.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index d3a6d2ed0..ba6f2198a 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -420,7 +420,7 @@ fn rename( OverwriteMode::NoClobber => return Ok(()), OverwriteMode::Interactive => { if !prompt_yes!("overwrite {}?", to.quote()) { - return Ok(()); + return Err(io::Error::new(io::ErrorKind::Other, "")); } } OverwriteMode::Force => {} diff --git a/tests/by-util/test_mv.rs b/tests/by-util/test_mv.rs index c5f930a2b..ffdff83dd 100644 --- a/tests/by-util/test_mv.rs +++ b/tests/by-util/test_mv.rs @@ -165,7 +165,7 @@ fn test_mv_interactive() { .arg(file_a) .arg(file_b) .pipe_in("n") - .succeeds() + .fails() .no_stdout(); assert!(at.file_exists(file_a));