summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-08-06 00:18:01 +0000
committerZac Medico <zmedico@gentoo.org>2006-08-06 00:18:01 +0000
commitf7b999960880c1540a683f2ba5b48da3d0958385 (patch)
treefaca17ff79dc8ee42c8d0f380131831934f4d01e
parentcf75e322562b22ff347ecba76d53555702049ece (diff)
downloadportage-f7b999960880c1540a683f2ba5b48da3d0958385.tar.gz
portage-f7b999960880c1540a683f2ba5b48da3d0958385.tar.bz2
portage-f7b999960880c1540a683f2ba5b48da3d0958385.zip
Allow USE_EXPAND vars to be overridden in the environment for bug #142909.
svn path=/main/trunk/; revision=4175
-rw-r--r--pym/portage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 9d5b25cf7..3da97fc51 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1479,10 +1479,10 @@ class config:
myflags=[]
for curdb in mydbs:
- if not curdb.has_key(mykey):
+ if mykey not in curdb and mykey != "USE":
continue
#variables are already expanded
- mysplit=curdb[mykey].split()
+ mysplit = curdb.get(mykey, "").split()
if mykey == "USE":
for var in use_expand: