From 6714ea6be40055e7f543ac714db4efddd80871d2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 18 Oct 2009 03:58:34 +0000 Subject: [PATCH] Fix repoman breakage from previous commit. (trunk r14627) svn path=/main/branches/2.1.7/; revision=14655 --- 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 2d391bf44..1b50b4cbb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7955,10 +7955,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 -- 2.26.2