Remove some boolean logic that is obsolete now that the "selective" parameter
authorZac Medico <zmedico@gentoo.org>
Tue, 1 Apr 2008 18:36:03 +0000 (18:36 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 1 Apr 2008 18:36:03 +0000 (18:36 -0000)
is passed into dep_zapdeps().

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

pym/portage/__init__.py

index a853e067fe4d281102e00e8d28d7db22ba8a266d..53efef3e636e2f80d6ed91cb46f30681a97652f0 100644 (file)
@@ -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)