Make the fix for bug #139600 slightly less icky by grabbing the ACCEPT_KEYWORDS throu...

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

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 1fe162bff2d2fa15fe93507a7c59f850bf02a19d..71ff993ba0945998d504c1b648561a72fcb9a520 100644 (file)
--- 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: