From 11577ad0d41fd81de623c443686e08719dfa5d8b Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Jun 2006 06:51:30 +0000
Subject: Remove all direct references to global variables from unmerge().

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

(limited to 'pym')

diff --git a/pym/portage.py b/pym/portage.py
index 6af9a7848..21f2fabd0 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3536,9 +3536,10 @@ def cpv_getkey(mycpv):
 	else:
 		return mysplit
 
-def key_expand(mykey,mydb=None,use_cache=1):
+def key_expand(mykey, mydb=None, use_cache=1, settings=None):
 	mysplit=mykey.split("/")
-	global settings
+	if settings is None:
+		settings = globals()["settings"]
 	virts = settings.getvirtuals("/")
 	virts_p = settings.get_virts_p("/")
 	if len(mysplit)==1:
-- 
cgit v1.2.3-1-g7c22