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