| 1 |
commit: c3b98e6b66364a08d1dadd3df7d84ad5f133fb1c |
| 2 |
Author: hugbubby <hugbubby <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Wed Mar 21 18:55:56 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 21 19:04:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c3b98e6b |
| 7 |
|
| 8 |
_solve_..slot_conflicts: Remove double-check of unexplored stack. |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/portage/pull/272 |
| 11 |
|
| 12 |
pym/_emerge/depgraph.py | 8 +++++--- |
| 13 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 16 |
index 5c863103e..431784f1f 100644 |
| 17 |
--- a/pym/_emerge/depgraph.py |
| 18 |
+++ b/pym/_emerge/depgraph.py |
| 19 |
@@ -1539,9 +1539,11 @@ class depgraph(object): |
| 20 |
explored_nodes = set() |
| 21 |
|
| 22 |
while unexplored: |
| 23 |
- # Handle all unexplored packages. |
| 24 |
- while unexplored: |
| 25 |
- node = unexplored.pop() |
| 26 |
+ while True: |
| 27 |
+ try: |
| 28 |
+ node = unexplored.pop() |
| 29 |
+ except IndexError: |
| 30 |
+ break |
| 31 |
for child in conflict_graph.child_nodes(node): |
| 32 |
# Don't explore a node more than once, in order |
| 33 |
# to avoid infinite recursion. The forced set |
Archives