From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 41CB313838B for ; Wed, 24 Sep 2014 16:20:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E19AAE0849; Wed, 24 Sep 2014 16:20:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8CD48E0849 for ; Wed, 24 Sep 2014 16:20:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C24A33BE3A for ; Wed, 24 Sep 2014 16:20:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EBB66215 for ; Wed, 24 Sep 2014 16:20:04 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1411573697.d7f7112b410bfead272f3d07829efc8fa80c4023.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d7f7112b410bfead272f3d07829efc8fa80c4023 X-VCS-Branch: master Date: Wed, 24 Sep 2014 16:20:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 81c68ea2-0678-4367-87b9-949774259945 X-Archives-Hash: ce78686043d5209a96ac05467ee7a9ce commit: d7f7112b410bfead272f3d07829efc8fa80c4023 Author: Zac Medico gentoo org> AuthorDate: Wed Sep 24 02:28:22 2014 +0000 Commit: Zac Medico gentoo 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: