From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 20 Dec 2007 13:08:23 +0000 (-0000)
Subject: Make dep_zapdeps() fall back to installed packages in it's
X-Git-Tag: v2.1.4~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9214bc41ebaefdd44edddc3368ab208ab82edb06;p=portage.git

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
---

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.