From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 24 Jun 2007 07:11:46 +0000 (-0000)
Subject: Make the fix for bug #139600 slightly less icky by grabbing the ACCEPT_KEYWORDS throu... 
X-Git-Tag: v2.2_pre1~1167
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d744c7bbc204ae5fd986e6fb9fdac734cb20637;p=portage.git

Make the fix for bug #139600 slightly less icky by grabbing the ACCEPT_KEYWORDS through mysettings.configdict[backupenv] instead of directly through os.environ.

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

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 1fe162bff..71ff993ba 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -654,7 +654,8 @@ class portdbapi(dbapi):
 		# Hack: Need to check the env directly here as otherwise stacking 
 		# doesn't work properly as negative values are lost in the config
 		# object (bug #139600)
-		egroups = os.environ.get("ACCEPT_KEYWORDS", "").split()
+		egroups = self.mysettings.configdict["backupenv"].get(
+			"ACCEPT_KEYWORDS", "").split()
 
 		for mycpv in mylist:
 			try: