diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-06-24 07:11:46 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-06-24 07:11:46 +0000 |
commit | 0d744c7bbc204ae5fd986e6fb9fdac734cb20637 (patch) | |
tree | 362181dd737089d1334974010e5d856195c74f60 | |
parent | eee40c7e4715a2d57745a4f18927381d6393f395 (diff) | |
download | portage-0d744c7bbc204ae5fd986e6fb9fdac734cb20637.tar.gz portage-0d744c7bbc204ae5fd986e6fb9fdac734cb20637.tar.bz2 portage-0d744c7bbc204ae5fd986e6fb9fdac734cb20637.zip |
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
-rw-r--r-- | pym/portage/dbapi/porttree.py | 3 |
1 files changed, 2 insertions, 1 deletions
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: |