| 1 |
commit: d7f7112b410bfead272f3d07829efc8fa80c4023 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 24 02:28:22 2014 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 24 15:48:17 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d7f7112b |
| 7 |
|
| 8 |
_want_update_pkg: fix bug #523532 |
| 9 |
|
| 10 |
This fixes depth increment to handle _UNREACHABLE_DEPTH. Note that there |
| 11 |
are some remaining "depth > deep" and "depth + 1" expressions that are |
| 12 |
protected by short-circuit evaluation (when deep is True). |
| 13 |
|
| 14 |
Fixes: 336ab90212c8 ("depgraph._add_dep: fix bug #520950") |
| 15 |
X-Gentoo-Bug: 523532 |
| 16 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=523532 |
| 17 |
|
| 18 |
--- |
| 19 |
pym/_emerge/depgraph.py | 3 ++- |
| 20 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 23 |
index f4e5a1b..f6f716d 100644 |
| 24 |
--- a/pym/_emerge/depgraph.py |
| 25 |
+++ b/pym/_emerge/depgraph.py |
| 26 |
@@ -4993,7 +4993,8 @@ class depgraph(object): |
| 27 |
raise |
| 28 |
|
| 29 |
depth = parent.depth or 0 |
| 30 |
- depth += 1 |
| 31 |
+ if isinstance(depth, int): |
| 32 |
+ depth += 1 |
| 33 |
|
| 34 |
if arg_atoms: |
| 35 |
for arg, atom in arg_atoms: |
Archives