From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Tue, 22 Dec 2009 20:05:56 +0000 (-0000)
Subject: Bug #297933: Filter BASHOPTS variable for compatibility with bash-4.1.
X-Git-Tag: v2.2_rc61~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=00ff606e92e3ae5ec7a1aa04ce3eb1878dc67adb;p=portage.git

Bug #297933: Filter BASHOPTS variable for compatibility with bash-4.1.

svn path=/main/trunk/; revision=15130
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c9b5d50c0..6f6280585 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1647,8 +1647,8 @@ PORTAGE_MUTABLE_FILTERED_VARS="AA HOSTNAME"
 # variables out and discards them. See bug #190128.
 filter_readonly_variables() {
 	local x filtered_vars
-	local readonly_bash_vars="BASHPID DIRSTACK EUID FUNCNAME
-		GROUPS PIPESTATUS PPID SHELLOPTS UID"
+	local readonly_bash_vars="BASHOPTS BASHPID DIRSTACK EUID
+		FUNCNAME GROUPS PIPESTATUS PPID SHELLOPTS UID"
 	local bash_misc_vars="BASH BASH_.* COMP_WORDBREAKS HISTCMD
 		HISTFILE HOSTNAME HOSTTYPE IFS LINENO MACHTYPE OLDPWD
 		OPTERR OPTIND OSTYPE POSIXLY_CORRECT PS4 PWD RANDOM