From b79d97c1c9ecf237f26e77d3cded158603583ab6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 17 Oct 2009 23:42:46 +0000 Subject: Fix repoman breakage from previous commit. svn path=/main/trunk/; revision=14627 --- pym/portage/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 0edb61162..0e2499add 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7958,10 +7958,10 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): use_binaries=use_binaries, trees=trees) else: atoms = [x] - if not vardb: - # called by repoman - other.append((atoms, None, None, False)) - continue + if vardb is None: + # When called by repoman, we can simply return the first choice + # because dep_eval() handles preference selection. + return atoms all_available = True all_use_satisfied = True -- cgit v1.2.3-1-g7c22