From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 24 Dec 2009 04:02:21 +0000 (-0000)
Subject: Bug #297933: Filter BASHOPTS variable for compatibility with bash-4.1.
X-Git-Tag: v2.1.7.16~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb1de6c26edabe4e4d5babe031e09d86d087e0dc;p=portage.git

Bug #297933: Filter BASHOPTS variable for compatibility with bash-4.1.
(trunk r15130)

svn path=/main/branches/2.1.7/; revision=15142
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index a72ace8ea..b53295bec 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1653,8 +1653,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