Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Wed, 21 Mar 2018 19:25:31
Message-Id: 1521660307.9de7c259ed4f75abbd09cfdbdfa183cec36c1286.zmedico@gentoo
1 commit: 9de7c259ed4f75abbd09cfdbdfa183cec36c1286
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 21 19:25:07 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 21 19:25:07 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9de7c259
7
8 _solve_..slot_conflicts: fix KeyError: 'pop from an empty set'
9
10 Fixes: c3b98e6b6636 (_solve_..slot_conflicts: Remove double-check of unexplored stack.)
11
12 pym/_emerge/depgraph.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
16 index 47c8a87e8..6c728684f 100644
17 --- a/pym/_emerge/depgraph.py
18 +++ b/pym/_emerge/depgraph.py
19 @@ -1542,7 +1542,7 @@ class depgraph(object):
20 while True:
21 try:
22 node = unexplored.pop()
23 - except IndexError:
24 + except KeyError:
25 break
26 for child in conflict_graph.child_nodes(node):
27 # Don't explore a node more than once, in order