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 9d5b25cf73b019ee97a25f9427dd69160c49e565..3da97fc51f37ed48aed1a1246ab77354cb0a8b3f 100644 (file)
--- 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: