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 839117a659b73e192d05ef47090553afc1e6e7b2..227d7e21a885e8befe3246873db8759849fda1e2 100644 (file)
--- 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])