diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-20 13:08:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-20 13:08:23 +0000 |
| commit | 9214bc41ebaefdd44edddc3368ab208ab82edb06 (patch) | |
| tree | 46e91f514eecef01c93c39db5bee21260748a92b | |
| parent | 2b9f49600e772877303a58e2d3225a51c4b8f793 (diff) | |
| download | portage-9214bc41ebaefdd44edddc3368ab208ab82edb06.tar.gz portage-9214bc41ebaefdd44edddc3368ab208ab82edb06.tar.bz2 portage-9214bc41ebaefdd44edddc3368ab208ab82edb06.zip | |
Make dep_zapdeps() fall back to installed packages in it's
availability test in cases where the package does not
appear to be masked. This solves dep selection preference
issues when working without a portage tree. (trunk r8988)
svn path=/main/branches/2.1.2/; revision=8989
| -rw-r--r-- | pym/portage.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 6bb041d4a..bfb330095 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5210,7 +5210,8 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): if avail_pkg: avail_slot = "%s:%s" % (dep_getkey(atom), mydbapi.aux_get(avail_pkg, ["SLOT"])[0]) - elif not avail_pkg and use_binaries: + elif not avail_pkg and \ + (use_binaries or not mydbapi.cp_list(dep_getkey(atom))): # With --usepkgonly, count installed packages as "available". # Note that --usepkgonly currently has no package.mask support. # See bug #149816. |