diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-01-04 15:47:54 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-04 17:00:00 -0800 |
| commit | e1ba9c2df91f9898ac35db8a1a3e638ae2b5033b (patch) | |
| tree | 1c8213b4434d792fbabe3926937412092d50a6a9 | |
| parent | fix indentation from commit f29d351990f0a3dd6183ec888ba8b0ff522c0875 (diff) | |
| download | portage-e1ba9c2df91f9898ac35db8a1a3e638ae2b5033b.tar.gz portage-e1ba9c2df91f9898ac35db8a1a3e638ae2b5033b.tar.bz2 portage-e1ba9c2df91f9898ac35db8a1a3e638ae2b5033b.zip | |
dep_zapdeps: add other_installed_some choice bin
| -rw-r--r-- | pym/portage/dep/dep_check.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index cf62d337b..cd740cda3 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -257,6 +257,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): unsat_use_installed = [] unsat_use_non_installed = [] other_installed = [] + other_installed_some = [] other = [] # unsat_use_* must come after preferred_non_installed @@ -270,6 +271,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): unsat_use_installed, unsat_use_non_installed, other_installed, + other_installed_some, other, ) @@ -427,12 +429,18 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): unsat_use_non_installed.append(this_choice) else: all_installed = True + some_installed = False for atom in atoms: - if not atom.blocker and not vardb.match(atom): - all_installed = False - break + if not atom.blocker: + if vardb.match(atom): + some_installed = True + else: + all_installed = False + if all_installed: other_installed.append(this_choice) + elif some_installed: + other_installed_some.append(this_choice) else: other.append(this_choice) |