diff options
| -rw-r--r-- | src/copy.c | 8 | ||||
| -rwxr-xr-x | tests/mv/i-3.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/copy.c b/src/copy.c index 71813dc40..781cc1e15 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1575,10 +1575,10 @@ overwrite_ok (struct cp_options const *x, char const *dst_name, strmode (dst_sb->st_mode, perms); perms[10] = '\0'; fprintf (stderr, - _((x->unlink_dest_before_opening - || x->unlink_dest_after_failed_open) - ? "%s: replace %s, overriding mode %04lo (%s)? " - : "%s: unwritable %s (mode %04lo, %s); try anyway? "), + (x->move_mode || x->unlink_dest_before_opening + || x->unlink_dest_after_failed_open) + ? _("%s: replace %s, overriding mode %04lo (%s)? ") + : _("%s: unwritable %s (mode %04lo, %s); try anyway? "), program_name, quote (dst_name), (unsigned long int) (dst_sb->st_mode & CHMOD_MODE_BITS), &perms[1]); diff --git a/tests/mv/i-3.sh b/tests/mv/i-3.sh index 690af7385..8c58d5d34 100755 --- a/tests/mv/i-3.sh +++ b/tests/mv/i-3.sh @@ -52,7 +52,7 @@ check_overwrite_prompt() } # Wait for up to 12.7 seconds for the expected prompt. -retry_delay_ check_overwrite_prompt .1 7 || fail=1 +retry_delay_ check_overwrite_prompt .1 7 || { fail=1; cat out; } kill $pid |