summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-17 23:42:46 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-17 23:42:46 +0000
commitb79d97c1c9ecf237f26e77d3cded158603583ab6 (patch)
treeab020e76fc5b04c6503fc29d30cdb72618e73424
parentdc9d1bc2ceb1644fec90df61719b7b5f295f7182 (diff)
downloadportage-b79d97c1c9ecf237f26e77d3cded158603583ab6.tar.gz
portage-b79d97c1c9ecf237f26e77d3cded158603583ab6.tar.bz2
portage-b79d97c1c9ecf237f26e77d3cded158603583ab6.zip
Fix repoman breakage from previous commit.
svn path=/main/trunk/; revision=14627
-rw-r--r--pym/portage/__init__.py8
1 files 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