diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-24 06:51:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-24 06:51:30 +0000 |
| commit | 11577ad0d41fd81de623c443686e08719dfa5d8b (patch) | |
| tree | d0f905a053b1df65fd618b1798fd45d120bbfc9e /pym | |
| parent | 8d305319c1c626793b81161146b44fbe8ade5d39 (diff) | |
| download | portage-11577ad0d41fd81de623c443686e08719dfa5d8b.tar.gz portage-11577ad0d41fd81de623c443686e08719dfa5d8b.tar.bz2 portage-11577ad0d41fd81de623c443686e08719dfa5d8b.zip | |
Remove all direct references to global variables from unmerge().
svn path=/main/trunk/; revision=3635
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 3 insertions, 2 deletions
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: |