rpms/coreutils/F-8 coreutils-6.9-du-ls-upstream.patch, 1.1, 1.2 coreutils.spec, 1.180, 1.181

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Thu Nov 29 15:47:14 UTC 2007


Author: ovasik

Update of /cvs/extras/rpms/coreutils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24416

Modified Files:
	coreutils-6.9-du-ls-upstream.patch coreutils.spec 
Log Message:
completed fix of wrong colored broken symlinks in ls(#404511)

coreutils-6.9-du-ls-upstream.patch:

Index: coreutils-6.9-du-ls-upstream.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils-6.9-du-ls-upstream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coreutils-6.9-du-ls-upstream.patch	23 Nov 2007 11:10:20 -0000	1.1
+++ coreutils-6.9-du-ls-upstream.patch	29 Nov 2007 15:47:11 -0000	1.2
@@ -72,7 +72,17 @@
 +	  || (is_colored (C_EXEC) && color_symlink_as_referent)
 	  || (is_colored (C_MISSING) && format == long_format))
 	check_symlink_color = true;
- 
+
+@@ -2570,7 +2574,8 @@ gobble_file (char const *name, enum file
+       || ((print_inode || format_needs_type)
+ 	  && (type == symbolic_link || type == unknown)
+ 	  && (dereference == DEREF_ALWAYS
+-	      || (command_line_arg && dereference != DEREF_NEVER)))
++	      || (command_line_arg && dereference != DEREF_NEVER)
++	      || color_symlink_as_referent || check_symlink_color))
+       /* Command line dereferences are already taken care of by the above
+ 	 assertion that the inode number is not yet known.  */
+       || (print_inode && inode == NOT_AN_INODE_NUMBER) 
 @@ -2713,6 +2713,12 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
           free (linkname);
         }


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- coreutils.spec	23 Nov 2007 11:10:20 -0000	1.180
+++ coreutils.spec	29 Nov 2007 15:47:11 -0000	1.181
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.9
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -289,6 +289,9 @@
 /sbin/runuser
 
 %changelog
+* Thu Nov 29 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-11
+- completed fix of wrong colored broken symlinks in ls(#404511)
+
 * Fri Nov 23 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-10
 - fixed bug in handling YYYYMMDD date format with relative
   signed offset(#377821)




More information about the fedora-extras-commits mailing list