summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-16 23:05:51 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-16 23:05:51 +0000
commit889a96a3cf5563a5e846d88c8f4ea8bfe3026c4d (patch)
tree86c6ff7bedfe1315b3c0cd19fff28ab538b1fa5d
parent1651a12dfbcf423764af9e12dd760adff3def0b4 (diff)
downloadportage-889a96a3cf5563a5e846d88c8f4ea8bfe3026c4d.tar.gz
portage-889a96a3cf5563a5e846d88c8f4ea8bfe3026c4d.tar.bz2
portage-889a96a3cf5563a5e846d88c8f4ea8bfe3026c4d.zip
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
-rw-r--r--pym/portage.py5
1 files changed, 4 insertions, 1 deletions
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