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 216DB1382C5 for ; Wed, 21 Mar 2018 19:25:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04C91E090F; Wed, 21 Mar 2018 19:25:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CFD6CE090F for ; Wed, 21 Mar 2018 19:25:29 +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 5517E335C49 for ; Wed, 21 Mar 2018 19:25:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C28A258 for ; Wed, 21 Mar 2018 19:25:26 +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: <1521660307.9de7c259ed4f75abbd09cfdbdfa183cec36c1286.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: 9de7c259ed4f75abbd09cfdbdfa183cec36c1286 X-VCS-Branch: master Date: Wed, 21 Mar 2018 19:25:26 +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: 46d0e39e-de4c-4dec-9e4a-9db1d013ffbf X-Archives-Hash: c6760252966c252370c5f88b0828cc5e commit: 9de7c259ed4f75abbd09cfdbdfa183cec36c1286 Author: Zac Medico gentoo org> AuthorDate: Wed Mar 21 19:25:07 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 21 19:25:07 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9de7c259 _solve_..slot_conflicts: fix KeyError: 'pop from an empty set' Fixes: c3b98e6b6636 (_solve_..slot_conflicts: Remove double-check of unexplored stack.) pym/_emerge/depgraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 47c8a87e8..6c728684f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1542,7 +1542,7 @@ class depgraph(object): while True: try: node = unexplored.pop() - except IndexError: + except KeyError: break for child in conflict_graph.child_nodes(node): # Don't explore a node more than once, in order