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

svn path=/main/branches/2.1.2/; revision=9671

pym/portage.py

index 4158c99a2f3c8474b2952526111988d2f99eb633..f764dbfc21e990d902e462bf4e08ca42c31be78c 100644 (file)
@@ -5359,10 +5359,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)