diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-01 08:28:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-01 08:28:22 +0000 |
| commit | cf8a641be4cd30b7a763a6480bca65eb9b0e30fe (patch) | |
| tree | a65caebdc6655000b03ffe160655c8229b5abc7c | |
| parent | 9389eb3ee19edddba8ddff8d878a7c663feaa8ce (diff) | |
| download | portage-cf8a641be4cd30b7a763a6480bca65eb9b0e30fe.tar.gz portage-cf8a641be4cd30b7a763a6480bca65eb9b0e30fe.tar.bz2 portage-cf8a641be4cd30b7a763a6480bca65eb9b0e30fe.zip | |
Pass the trees into two more dep_zapdeps calls to avoid dependence on global variables.
svn path=/main/trunk/; revision=3731
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
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]) |