From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 6 Aug 2006 00:18:01 +0000 (-0000)
Subject: Allow USE_EXPAND vars to be overridden in the environment for bug #142909.
X-Git-Tag: v2.1.1~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7b999960880c1540a683f2ba5b48da3d0958385;p=portage.git

Allow USE_EXPAND vars to be overridden in the environment for bug #142909.

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

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: