From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 4 Jun 2006 03:13:16 +0000 (-0000)
Subject: Revert lazy loading of autouse because it is both broken and useless.
X-Git-Tag: v2.1~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7aecaff7d013c9478fca5892eadd7fb6359bac75;p=portage.git

Revert lazy loading of autouse because it is both broken and useless.

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

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: