From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 1 Apr 2008 18:36:03 +0000 (-0000)
Subject: Remove some boolean logic that is obsolete now that the "selective" parameter
X-Git-Tag: v2.2_pre6~276
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=365bf57da9cddcb9479d992aac30dff2e081be06;p=portage.git

Remove some boolean logic that is obsolete now that the "selective" parameter
is passed into dep_zapdeps().

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

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)