diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-03-26 13:36:16 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-26 08:23:23 -0700 |
| commit | 2d8ae88a228ac82c725f22aaee24accde8a12dcf (patch) | |
| tree | f1d384d80a79592f089cb10d7d68001aaaa52945 /src | |
| parent | 5de5d8a5c0aa864bbf79a299cf5b9d5a1547941a (diff) | |
| download | coreutils-2d8ae88a228ac82c725f22aaee24accde8a12dcf.tar.xz | |
mv: fix issues with previous prompt adjustments
* src/copy.c (overwrite_ok): Fix the gettext calls so
that the second string is tagged for translation.
Display the correct "replace ..." prompt when in move_mode.
* tests/mv/i-3.sh: Display the output on failure to ease debugging.
Diffstat (limited to 'src')
| -rw-r--r-- | src/copy.c | 8 |
1 files changed, 4 insertions, 4 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]); |