Fix repoman breakage from previous commit.
authorZac Medico <zmedico@gentoo.org>
Sat, 17 Oct 2009 23:42:46 +0000 (23:42 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 17 Oct 2009 23:42:46 +0000 (23:42 -0000)
svn path=/main/trunk/; revision=14627

pym/portage/__init__.py

index 0edb61162714d455be45964de58cf60769d3af0b..0e2499addb18f5fa1243a13ae707c7d4b9555bc3 100644 (file)
@@ -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