summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-01 18:36:03 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-01 18:36:03 +0000
commit365bf57da9cddcb9479d992aac30dff2e081be06 (patch)
tree4ddd5f8bfb83999aad7c7c6bcd59f36e2fdf2d44
parent672dad4ecc634ec20fbdcfdd86ae756283553050 (diff)
downloadportage-365bf57da9cddcb9479d992aac30dff2e081be06.tar.gz
portage-365bf57da9cddcb9479d992aac30dff2e081be06.tar.bz2
portage-365bf57da9cddcb9479d992aac30dff2e081be06.zip
Remove some boolean logic that is obsolete now that the "selective" parameter
is passed into dep_zapdeps(). svn path=/main/trunk/; revision=9669
-rw-r--r--pym/portage/__init__.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index a853e067f..53efef3e6 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5384,10 +5384,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
avail_slot = "%s:%s" % (dep_getkey(atom),
mydbapi.aux_get(avail_pkg, ["SLOT"])[0])
elif not avail_pkg:
- has_mask = False
- if hasattr(mydbapi, "xmatch"):
- has_mask = bool(mydbapi.xmatch("match-all", atom))
- if (selective or use_binaries or not has_mask):
+ if selective:
avail_pkg = vardb.match(atom)
if avail_pkg:
avail_pkg = avail_pkg[-1] # highest (ascending order)