summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-01 10:21:49 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-01 10:21:49 +0000
commitf06247853a6746621dc48135e8fbb4761ab1562a (patch)
treeaa310f3e98c403c1401ffb1d0162214658ba0134
parent4bc2cbce8365be595c4e700ce8f3ff9e33fee7fe (diff)
downloadportage-f06247853a6746621dc48135e8fbb4761ab1562a.tar.gz
portage-f06247853a6746621dc48135e8fbb4761ab1562a.tar.bz2
portage-f06247853a6746621dc48135e8fbb4761ab1562a.zip
Fix autouse so that it works with init_legacy_globals() disabled.
svn path=/main/trunk/; revision=3735
-rw-r--r--pym/portage.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 227d7e21a..2ad107d17 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -832,7 +832,8 @@ def autouse(myvartree, use_cache=1, mysettings=None):
break
if dep_met:
myusevars += " "+myuse
- autouse_val = myusevars
+ if myusevars:
+ autouse_val = myusevars
return myusevars
def check_config_instance(test):
@@ -1511,7 +1512,7 @@ class config:
for mykey in myincrementals:
if mykey=="USE":
mydbs=self.uvlist
- if "auto" in self["USE_ORDER"].split(":") and "settings" in globals():
+ if "auto" in self["USE_ORDER"].split(":"):
self.configdict["auto"]["USE"] = autouse(
vartree(root=self["ROOT"], categories=self.categories,
settings=self),