diff options
| author | Jason Stubbs <jstubbs@gentoo.org> | 2005-12-19 14:27:32 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-12-19 14:27:32 +0000 |
| commit | a0594fbeb6352dd2b375a922bdc4020ebbfdab54 (patch) | |
| tree | 33654ca4c3c884f45f4b3aaa8cb44923f59ca4d2 | |
| parent | 99acddf2cf9b970b30d35dc4296d6b3314183e91 (diff) | |
| download | portage-a0594fbeb6352dd2b375a922bdc4020ebbfdab54.tar.gz portage-a0594fbeb6352dd2b375a922bdc4020ebbfdab54.tar.bz2 portage-a0594fbeb6352dd2b375a922bdc4020ebbfdab54.zip | |
Check if atoms are masked when scanning for which || ( ) atom/list to use.
svn path=/main/trunk/; revision=2406
| -rw-r--r-- | pym/portage.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index c4bbea69e..54f1fa9f2 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3131,7 +3131,7 @@ def dep_zapdeps(unreduced,reduced,myroot,use_binaries=0): if dep_eval(reduced): return [] - found_idx = 1 + found_idx = None for x in range(1, len(unreduced)): if isinstance(unreduced[x], list): atom_list = dep_zapdeps(unreduced[x], reduced[x], myroot, use_binaries=use_binaries) @@ -3147,6 +3147,14 @@ def dep_zapdeps(unreduced,reduced,myroot,use_binaries=0): return atom_list found_idx = x break + if not found_idx: + all_found = True + for atom in atom_list: + if not db[myroot]["porttree"].dbapi.xmatch("match-visible", atom): + all_found = False + break + if all_found: + found_idx = x if isinstance(unreduced[found_idx], list): return dep_zapdeps(unreduced[found_idx], reduced[found_idx], myroot, use_binaries=use_binaries) |