[commits] r6912 - in /trunk/libc: ChangeLog.eglibc elf/ldd.bash.in

[joseph@xxxxxxxxxx]

Author: joseph
Date: Mon Sep  8 10:35:57 2008
New Revision: 6912

Log:
2008-09-08  Pete Eberlein  <eberlein@xxxxxxxxxx>

	* elf/ldd.bash.in: Make pipefail check more robust when using
	non-bash shells.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/elf/ldd.bash.in

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Mon Sep  8 10:35:57 2008
@@ -1,3 +1,8 @@
+2008-09-08  Pete Eberlein  <eberlein@xxxxxxxxxx>
+
+	* elf/ldd.bash.in: Make pipefail check more robust when using
+	non-bash shells.
+
 2008-09-08  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
 
 	* nscd/Makefile (CFLAGS-nis_hash.c): Set to $(nscd-cflags).

Modified: trunk/libc/elf/ldd.bash.in
==============================================================================
--- trunk/libc/elf/ldd.bash.in (original)
+++ trunk/libc/elf/ldd.bash.in Mon Sep  8 10:35:57 2008
@@ -110,7 +110,7 @@
 # environments where the executed program might not have permissions
 # to write to the console/tty.  But only bash 3.x supports the pipefail
 # option, and we don't bother to handle the case for older bash versions.
-if set -o pipefail 2> /dev/null; then
+if x=`set -o` && test "$x" != "${x#*pipefail}" && set -o pipefail ; then
   try_trace() {
     eval $add_env '"$@"' | cat
   }