From: Zac Medico Date: Sat, 1 Jul 2006 08:28:22 +0000 (-0000) Subject: Pass the trees into two more dep_zapdeps calls to avoid dependence on global variables. X-Git-Tag: v2.1.1~314 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf8a641be4cd30b7a763a6480bca65eb9b0e30fe;p=portage.git Pass the trees into two more dep_zapdeps calls to avoid dependence on global variables. svn path=/main/trunk/; revision=3731 --- diff --git a/pym/portage.py b/pym/portage.py index 839117a65..227d7e21a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3319,13 +3319,15 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): if not target: if isinstance(deps[0], list): - return dep_zapdeps(deps[0], satisfieds[0], myroot, use_binaries=use_binaries) + return dep_zapdeps(deps[0], satisfieds[0], myroot, + use_binaries=use_binaries, trees=trees) else: return [deps[0]] if isinstance(target, tuple): # Nothing matching installed if isinstance(target[0], list): # ... and the first available was a sublist - return dep_zapdeps(target[0], target[1], myroot, use_binaries=use_binaries) + return dep_zapdeps(target[0], target[1], myroot, + use_binaries=use_binaries, trees=trees) else: # ... and the first available was a single atom target = dep_getkey(target[0])