From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2BB771382C5 for ; Wed, 21 Mar 2018 19:05:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEF6BE0909; Wed, 21 Mar 2018 19:05:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA895E0909 for ; Wed, 21 Mar 2018 19:05:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35FB9335C09 for ; Wed, 21 Mar 2018 19:05:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FA6C258 for ; Wed, 21 Mar 2018 19:05:27 +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: <1521659055.c3b98e6b66364a08d1dadd3df7d84ad5f133fb1c.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: c3b98e6b66364a08d1dadd3df7d84ad5f133fb1c X-VCS-Branch: master Date: Wed, 21 Mar 2018 19:05:27 +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: 05c1f789-28a9-4dbc-a22c-dc3388062235 X-Archives-Hash: f23399690088df79d96c7c3990c6f401 commit: c3b98e6b66364a08d1dadd3df7d84ad5f133fb1c Author: hugbubby protonmail com> AuthorDate: Wed Mar 21 18:55:56 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 21 19:04:15 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c3b98e6b _solve_..slot_conflicts: Remove double-check of unexplored stack. Closes: https://github.com/gentoo/portage/pull/272 pym/_emerge/depgraph.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 5c863103e..431784f1f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1539,9 +1539,11 @@ class depgraph(object): explored_nodes = set() while unexplored: - # Handle all unexplored packages. - while unexplored: - node = unexplored.pop() + while True: + try: + node = unexplored.pop() + except IndexError: + break for child in conflict_graph.child_nodes(node): # Don't explore a node more than once, in order # to avoid infinite recursion. The forced set