From f06247853a6746621dc48135e8fbb4761ab1562a Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Jul 2006 10:21:49 +0000
Subject: Fix autouse so that it works with init_legacy_globals() disabled.

svn path=/main/trunk/; revision=3735
---
 pym/portage.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pym/portage.py')

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),
-- 
cgit v1.2.3-1-g7c22