Remove "selective" depgraph logic from dep_zapdeps() since it's now

handled by CompositeDbapi.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index dcafd05b777638ba30a22eefb2d9b82ebc9ffbdc..a4361e10942e2f7f84b73c1188b3b8337f729f12 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2412,14 +2412,12 @@ class depgraph(object):
                        trees = self._filtered_trees
                if True:
                        try:
-                               self.trees[root]["selective"] = "selective" in self.myparams
                                if not strict:
                                        portage.dep._dep_check_strict = False
                                mycheck = portage.dep_check(depstring, None,
                                        pkgsettings, myuse=myuse,
                                        myroot=root, trees=trees)
                        finally:
-                               self.trees[root]["selective"] = False
                                portage.dep._dep_check_strict = True
                        if not mycheck[0]:
                                raise portage.exception.InvalidDependString(mycheck[1])

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0d60fdc2fef7771c15a3cdf31aa309838a9834b7..b629ae128849b333f4259606788e231fca9484b6 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5379,7 +5379,6 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
        if trees is None:
                global db
                trees = db
-       selective = trees[myroot].get("selective", False)
        writemsg("ZapDeps -- %s\n" % (use_binaries), 2)
        if not reduced or unreduced == ["||"] or dep_eval(reduced):
                return []
@@ -5440,13 +5439,6 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
                                avail_pkg = avail_pkg[-1] # highest (ascending order)
                                avail_slot = "%s:%s" % (dep_getkey(atom),
                                        mydbapi.aux_get(avail_pkg, ["SLOT"])[0])
-                       elif not avail_pkg:
-                               if selective:
-                                       avail_pkg = vardb.match(atom)
-                                       if avail_pkg:
-                                               avail_pkg = avail_pkg[-1] # highest (ascending order)
-                                               avail_slot = "%s:%s" % (dep_getkey(atom),
-                                                       vardb.aux_get(avail_pkg, ["SLOT"])[0])
                        if not avail_pkg:
                                all_available = False
                                break