From 369aaf7e5dcabf995683eea9a3a1e497ade9cd12 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 16 Mar 2007 21:41:50 +0100 Subject: * 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. --- tests/mv/i-2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/mv') 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 -- cgit v1.2.3-54-g00ecf