| 1 |
commit: 6503980e0e3bcfce9fbaff85c33d87f616e955a9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 4 15:41:45 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 4 15:41:45 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6503980e |
| 7 |
|
| 8 |
depgraph: don't drop deps in _add_dep |
| 9 |
|
| 10 |
This will fix bug #353613. We remove a hunk of code that was meant |
| 11 |
to limit recursion, but is obsolete an buggy. The recursion limiting |
| 12 |
is now handled by _add_pkg and the _ignored_deps stack. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/_emerge/depgraph.py | 29 ----------------------------- |
| 16 |
1 files changed, 0 insertions(+), 29 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 19 |
index 811eda6..4334a33 100644 |
| 20 |
--- a/pym/_emerge/depgraph.py |
| 21 |
+++ b/pym/_emerge/depgraph.py |
| 22 |
@@ -683,8 +683,6 @@ class depgraph(object): |
| 23 |
dep_pkg = dep.child |
| 24 |
existing_node = self._dynamic_config._slot_pkg_map[ |
| 25 |
dep.root].get(dep_pkg.slot_atom) |
| 26 |
- if existing_node is not dep_pkg: |
| 27 |
- existing_node = None |
| 28 |
|
| 29 |
if not dep_pkg: |
| 30 |
if dep.priority.optional: |
| 31 |
@@ -731,33 +729,6 @@ class depgraph(object): |
| 32 |
noiselevel=-1, level=logging.DEBUG) |
| 33 |
|
| 34 |
return 0 |
| 35 |
- # In some cases, dep_check will return deps that shouldn't |
| 36 |
- # be proccessed any further, so they are identified and |
| 37 |
- # discarded here. Try to discard as few as possible since |
| 38 |
- # discarded dependencies reduce the amount of information |
| 39 |
- # available for optimization of merge order. |
| 40 |
- if dep.priority.satisfied and \ |
| 41 |
- dep.priority.satisfied.visible and \ |
| 42 |
- not dep_pkg.installed and \ |
| 43 |
- not (existing_node or recurse): |
| 44 |
- myarg = None |
| 45 |
- if dep.root == self._frozen_config.target_root: |
| 46 |
- try: |
| 47 |
- myarg = next(self._iter_atoms_for_pkg(dep_pkg)) |
| 48 |
- except StopIteration: |
| 49 |
- pass |
| 50 |
- except portage.exception.InvalidDependString: |
| 51 |
- if not dep_pkg.installed: |
| 52 |
- # This shouldn't happen since the package |
| 53 |
- # should have been masked. |
| 54 |
- raise |
| 55 |
- if not myarg: |
| 56 |
- # Existing child selection may not be valid unless |
| 57 |
- # it's added to the graph immediately, since "complete" |
| 58 |
- # mode may select a different child later. |
| 59 |
- dep.child = None |
| 60 |
- self._dynamic_config._ignored_deps.append(dep) |
| 61 |
- return 1 |
| 62 |
|
| 63 |
if not self._add_pkg(dep_pkg, dep): |
| 64 |
return 0 |
Archives