From 4637db713ecfa5475495cb466ceb462e417e523a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 1 Apr 2008 18:45:04 +0000 Subject: Remove some boolean logic that is obsolete now that the "selective" parameter is passed into dep_zapdeps(). (trunk r9669) svn path=/main/branches/2.1.2/; revision=9671 --- pym/portage.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 4158c99a2..f764dbfc2 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -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) -- cgit v1.2.3-1-g7c22