diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-05 09:15:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-05 09:15:10 +0000 |
| commit | 224515f3f141742b9690074ea59bb1952653185b (patch) | |
| tree | 6fd27b2fc8c60adba884c665b9869e321d8dc756 /pym | |
| parent | 2cd2076377d6459142f594ec46ccfcdaeb32292e (diff) | |
| download | portage-224515f3f141742b9690074ea59bb1952653185b.tar.gz portage-224515f3f141742b9690074ea59bb1952653185b.tar.bz2 portage-224515f3f141742b9690074ea59bb1952653185b.zip | |
Remove "selective" depgraph logic from dep_zapdeps() since it's now
handled by CompositeDbapi.
svn path=/main/trunk/; revision=9714
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index dcafd05b7..a4361e109 100644 --- 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 0d60fdc2f..b629ae128 100644 --- 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 |