From 9214bc41ebaefdd44edddc3368ab208ab82edb06 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 20 Dec 2007 13:08:23 +0000 Subject: [PATCH] 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 --- pym/portage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. -- 2.26.2