This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-603-ga542b38
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 3 Nov 2012 07:08:18 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-603-ga542b38
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a542b3894da05c9377beadfe13d68bd7387ebcc9 (commit)
from f62c8abcfbf0d2e7f0a6c6c1dde53158e6fc4e59 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a542b3894da05c9377beadfe13d68bd7387ebcc9
commit a542b3894da05c9377beadfe13d68bd7387ebcc9
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri Nov 2 18:33:33 2012 +0100
Make cross-test-ssh.sh compatible with a remote POSIX sh
diff --git a/ChangeLog b/ChangeLog
index fdb2ccb..16fa8ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-03 Andreas Schwab <schwab@linux-m68k.org>
+
+ * scripts/cross-test-ssh.sh (command): Use newlines to separate
+ commands. Quote $PWD.
+ (blacklist_exports): Don't use remove_newlines. Replace "declare
+ -x" by "export".
+ (remove_newlines): Remove.
+
2012-11-02 H.J. Lu <hongjiu.lu@intel.com>
* stdlib/Makefile (headers): Add bits/stdlib-float.h.
diff --git a/scripts/cross-test-ssh.sh b/scripts/cross-test-ssh.sh
index f09c98e..51b0da9 100755
--- a/scripts/cross-test-ssh.sh
+++ b/scripts/cross-test-ssh.sh
@@ -108,37 +108,25 @@ bourne_quote ()
done
}
-# Remove unnecessary newlines from a Bourne shell command sequence.
-remove_newlines ()
-{
- sed -n \
- -e '1h' \
- -e '2,$H' \
- -e '${g
- s/\([^\]\)\n/\1; /g
- p
- }'
-}
-
# Unset all variables from the blacklist. Then echo all exported
-# variables. The 'export -p' command adds backslashes for environment
-# variables which contain newlines.
+# variables.
blacklist_exports ()
{
- (unset ${env_blacklist}; export -p) | remove_newlines
+ (unset ${env_blacklist}; export -p) | sed 's/^declare -x/export/'
}
-# Produce properly quoted Bourne shell arguments for 'env' to carry
-# over the current environment, less blacklisted variables.
+# Produce commands to carry over the current environment, less blacklisted
+# variables.
exports="$(blacklist_exports)"
-exports="${exports:+${exports}; }"
# Transform the current argument list into a properly quoted Bourne shell
# command string.
command="$(bourne_quote "$@")"
# Add commands to set environment variables and the current directory.
-command="${exports}cd $PWD; ${command}"
+command="${exports}
+cd $(bourne_quote "$PWD")
+${command}"
# HOST's sshd simply concatenates its arguments with spaces and
# passes them to some shell. We want to force the use of /bin/sh,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
scripts/cross-test-ssh.sh | 26 +++++++-------------------
2 files changed, 15 insertions(+), 19 deletions(-)
hooks/post-receive
--
GNU C Library master sources