rpms/coreutils/FC-6 coreutils-223869.patch, NONE, 1.1 coreutils.spec, 1.149, 1.150

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/coreutils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv17413

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-223869.patch 
Log Message:
* Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com>
- Fixed wrong error message (bug #223869).
- Resolves: rhbz#223869


coreutils-223869.patch:
 THANKS     |    1 +
 src/copy.c |   13 +------------
 2 files changed, 2 insertions(+), 12 deletions(-)

--- NEW FILE coreutils-223869.patch ---
--- coreutils-5.97/src/copy.c.223869	2007-01-24 16:33:24.000000000 +0000
+++ coreutils-5.97/src/copy.c	2007-01-24 16:33:33.000000000 +0000
@@ -1352,18 +1352,7 @@
 
       /* This happens when attempting to rename a directory to a
 	 subdirectory of itself.  */
-      if (errno == EINVAL
-
-	  /* When src_name is on an NFS file system, some types of
-	     clients, e.g., SunOS4.1.4 and IRIX-5.3, set errno to EIO
-	     instead.  Testing for this here risks misinterpreting a real
-	     I/O error as an attempt to move a directory into itself, so
-	     FIXME: consider not doing this.  */
-	  || errno == EIO
-
-	  /* And with SunOS-4.1.4 client and OpenBSD-2.3 server,
-	     we get ENOTEMPTY.  */
-	  || errno == ENOTEMPTY)
+      if (errno == EINVAL)
 	{
 	  /* FIXME: this is a little fragile in that it relies on rename(2)
 	     failing with a specific errno value.  Expect problems on
--- coreutils-5.97/THANKS.223869	2006-01-10 09:16:28.000000000 +0000
+++ coreutils-5.97/THANKS	2007-01-24 16:33:33.000000000 +0000
@@ -148,6 +148,7 @@
 Felix Lee                           flee at teleport.com
 Ferdinand                           fw at scenic.mine.nu
 Fletcher Mattox                     fletcher at cs.utexas.edu
+Florent Bayle                       florent at sarcelle.net
 Florin Iucha                        fiucha at hsys.mic.ro
 François Pinard                     pinard at iro.umontreal.ca
 Frank Adler                         fadler at allesklar.de


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- coreutils.spec	10 Jan 2007 15:01:33 -0000	1.149
+++ coreutils.spec	24 Jan 2007 16:37:24 -0000	1.150
@@ -23,6 +23,7 @@
 Patch1: coreutils-sort-compatibility.patch
 Patch2: coreutils-rename.patch
 Patch3: coreutils-cut-coredump.patch
+Patch4: coreutils-223869.patch
 Patch10: coreutils-newhashes.patch
 
 # Our patches
@@ -84,6 +85,7 @@
 %patch1 -p1 -b .sort-compatibility
 %patch2 -p1 -b .rename
 %patch3 -p1 -b .cut-coredump
+%patch4 -p1 -b .223869
 %patch10 -p1 -b .newhashes
 
 # Our patches
@@ -286,6 +288,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed wrong error message (bug #223869).
+
 * Wed Jan 10 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.3
 - Prevent a cut(1) crash (bug #220312).