From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 16 Jan 2007 23:05:51 +0000 (-0000)
Subject: Prevent packages that are installed but masked from being incorrectly flagged as... 
X-Git-Tag: v2.1.2-r1~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=889a96a3cf5563a5e846d88c8f4ea8bfe3026c4d;p=portage.git

Prevent packages that are installed but masked from being incorrectly flagged as "available" (unless --usepkgonly is enabled, which currently has no package.mask support).

svn path=/main/trunk/; revision=5679
---

diff --git a/pym/portage.py b/pym/portage.py
index 2ea696645..0b9c1f3a7 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4045,7 +4045,10 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
 		all_available = True
 		for atom in atoms:
 			if not mydbapi.match(atom):
-				if vardb and vardb.match(atom):
+				# With --usepkgonly, count installed packages as "available".
+				# Note that --usepkgonly currently has no package.mask support.
+				# See bug #149816.
+				if use_binaries and vardb and vardb.match(atom):
 					continue
 				all_available = False
 				break