Fix repoman breakage from previous commit. (trunk r14627)
authorZac Medico <zmedico@gentoo.org>
Sun, 18 Oct 2009 03:58:34 +0000 (03:58 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 18 Oct 2009 03:58:34 +0000 (03:58 -0000)
svn path=/main/branches/2.1.7/; revision=14655

pym/portage/__init__.py

index 2d391bf4465f80168d999951ee27c194d900525d..1b50b4cbb991601b8764589065ec0c4a1a6c85b7 100644 (file)
@@ -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