diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2007-03-16 21:41:50 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-03-16 21:41:50 +0100 |
| commit | 369aaf7e5dcabf995683eea9a3a1e497ade9cd12 (patch) | |
| tree | 0e0bd52515194d06487acb8b6e25331011a53c3f /tests | |
| parent | 39e85b7258340611a77a70e2ad46184f1081bbdf (diff) | |
| download | coreutils-369aaf7e5dcabf995683eea9a3a1e497ade9cd12.tar.xz | |
* src/copy.c: Include filemode.h.
(overwrite_prompt): Say "try to overwrite", not "overwrite", to
make it clearer that the attempt may fail. Problem reported by
Dan Jacobson in:
http://lists.gnu.org/archive/html/bug-coreutils/2007-03/msg00130.html
Output symbolic mode as well as numeric.
* tests/mv/i-2 (fail): Adjust to new prompt format.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/mv/i-2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mv/i-2 b/tests/mv/i-2 index ae7c5a135..36d1ce474 100755 --- a/tests/mv/i-2 +++ b/tests/mv/i-2 @@ -2,7 +2,7 @@ # Test both cp and mv for their behavior with -if and -fi # The standards (POSIX and SuS) dictate annoyingly inconsistent behavior. -# Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2006, 2007 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -61,7 +61,7 @@ cp -if e f < y > out 2>&1 || fail=1 # Make sure out contains the prompt. case "`cat out`" in - "cp: overwrite \`f', overriding mode 0000?"*) ;; + "cp: try to overwrite \`f', overriding mode 0000 (---------)?"*) ;; *) fail=1 ;; esac |