summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-04 03:13:16 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-04 03:13:16 +0000
commit7aecaff7d013c9478fca5892eadd7fb6359bac75 (patch)
tree87079c3ea30b00808633af994a4006a642ee18a9
parentf4e5ff6000a8fcff3b0cade73200c7ff5a48c2df (diff)
downloadportage-7aecaff7d013c9478fca5892eadd7fb6359bac75.tar.gz
portage-7aecaff7d013c9478fca5892eadd7fb6359bac75.tar.bz2
portage-7aecaff7d013c9478fca5892eadd7fb6359bac75.zip
Revert lazy loading of autouse because it is both broken and useless.
svn path=/main/trunk/; revision=3453
-rw-r--r--pym/portage.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 6eca7d59f..20ce4224a 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1545,9 +1545,8 @@ class config:
for mykey in myincrementals:
if mykey=="USE":
mydbs=self.uvlist
- if "auto" in self["USE_ORDER"].split(":"):
- self.configdict["auto"] = portage_util.LazyItemsDict(self.configdict["auto"])
- self.configdict["auto"].addLazySingleton("USE", autouse,
+ if "auto" in self["USE_ORDER"].split(":") and "settings" in globals():
+ self.configdict["auto"]["USE"] = autouse(
vartree(root=self["ROOT"], categories=self.categories),
use_cache=use_cache, mysettings=self)
else: