[gentoo-commits] proj/eselect:master commit in: libs/, /, bin/

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     3a412426d924310abb59311dd3cc1133eb1c6849
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 13:05:46 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 13:05:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=3a412426

Work around bash crashing on Darwin, bug 475284.

* bin/eselect.in: Save stderr only in bash 4.1 or later, where
automatically assigned file descriptors are available. Using a
fixed descriptor makes bash crash on Darwin, bug 475284.
* libs/core.bash.in (die): Test for saved file descriptor.

---
 ChangeLog         | 7 +++++++
 bin/eselect.in    | 7 ++++---
 libs/core.bash.in | 4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1809cfb..f6ea4ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-06  Ulrich Müller  <ulm@gentoo.org>
+
+	* bin/eselect.in: Save stderr only in bash 4.1 or later, where
+	automatically assigned file descriptors are available. Using a
+	fixed descriptor makes bash crash on Darwin, bug 475284.
+	* libs/core.bash.in (die): Test for saved file descriptor.
+
 2013-07-04  Ulrich Müller  <ulm@gentoo.org>
 
 	* misc/eselect-mode.el: New file, editing mode for Emacs,

diff --git a/bin/eselect.in b/bin/eselect.in
index 8fd1589..ea632ce 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -56,9 +56,10 @@ shopt -s extglob
 shopt -s expand_aliases
 
 # Save stderr file descriptor
-# exec {ESELECT_STDERR}>&2		# >=bash-4.1
-exec 3>&2
-ESELECT_STDERR=3
+if (( BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1 || BASH_VERSINFO[0] > 4 ))
+then
+	exec {ESELECT_STDERR}>&2	# >=bash-4.1
+fi
 
 # Load core functions
 source "${ESELECT_CORE_PATH}/core.bash" || exit 255

diff --git a/libs/core.bash.in b/libs/core.bash.in
index fe174d1..2a682ce 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -32,8 +32,8 @@ check_do() {
 die() {
 	local item funcname="" sourcefile="" lineno="" n e s="yes"
 
-	# Restore stderr if it was redirected
-	exec 2>&${ESELECT_STDERR}
+	# Restore stderr
+	[[ -n ${ESELECT_STDERR} ]] && exec 2>&${ESELECT_STDERR}
 
 	# do we have a working write_error_msg?
 	if is_function "write_error_msg"; then