diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-02-04 07:41:45 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-02-04 07:41:45 -0800 |
commit | 6503980e0e3bcfce9fbaff85c33d87f616e955a9 (patch) | |
tree | 174552d122de672c3b44b5b3bf5c37831785410d | |
parent | 676c6b3845482730d1dec4d683bc6138a5f30727 (diff) | |
download | portage-6503980e0e3bcfce9fbaff85c33d87f616e955a9.tar.gz portage-6503980e0e3bcfce9fbaff85c33d87f616e955a9.tar.bz2 portage-6503980e0e3bcfce9fbaff85c33d87f616e955a9.zip |
depgraph: don't drop deps in _add_dep
This will fix bug #353613. We remove a hunk of code that was meant
to limit recursion, but is obsolete an buggy. The recursion limiting
is now handled by _add_pkg and the _ignored_deps stack.
-rw-r--r-- | pym/_emerge/depgraph.py | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 811eda68e..4334a3308 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -683,8 +683,6 @@ class depgraph(object): dep_pkg = dep.child existing_node = self._dynamic_config._slot_pkg_map[ dep.root].get(dep_pkg.slot_atom) - if existing_node is not dep_pkg: - existing_node = None if not dep_pkg: if dep.priority.optional: @@ -731,33 +729,6 @@ class depgraph(object): noiselevel=-1, level=logging.DEBUG) return 0 - # In some cases, dep_check will return deps that shouldn't - # be proccessed any further, so they are identified and - # discarded here. Try to discard as few as possible since - # discarded dependencies reduce the amount of information - # available for optimization of merge order. - if dep.priority.satisfied and \ - dep.priority.satisfied.visible and \ - not dep_pkg.installed and \ - not (existing_node or recurse): - myarg = None - if dep.root == self._frozen_config.target_root: - try: - myarg = next(self._iter_atoms_for_pkg(dep_pkg)) - except StopIteration: - pass - except portage.exception.InvalidDependString: - if not dep_pkg.installed: - # This shouldn't happen since the package - # should have been masked. - raise - if not myarg: - # Existing child selection may not be valid unless - # it's added to the graph immediately, since "complete" - # mode may select a different child later. - dep.child = None - self._dynamic_config._ignored_deps.append(dep) - return 1 if not self._add_pkg(dep_pkg, dep): return 0 |