diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:58:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:58:34 +0000 |
| commit | 6714ea6be40055e7f543ac714db4efddd80871d2 (patch) | |
| tree | 07b40ee0010c1e276380974d130ef7ee6b009826 | |
| parent | 17a870d8b5b4c6155b6758a0a7ce11f14934b9a6 (diff) | |
| download | portage-6714ea6be40055e7f543ac714db4efddd80871d2.tar.gz portage-6714ea6be40055e7f543ac714db4efddd80871d2.tar.bz2 portage-6714ea6be40055e7f543ac714db4efddd80871d2.zip | |
Fix repoman breakage from previous commit. (trunk r14627)
svn path=/main/branches/2.1.7/; revision=14655
| -rw-r--r-- | pym/portage/__init__.py | 8 |
1 files 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 |