| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-27 18:27:19 +0000 (Sat, 27 Dec 2008) |
| 3 |
New Revision: 12354 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Fix loop logic some more for bug #252572. (trunk r12349) |
| 9 |
|
| 10 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2008-12-27 18:26:49 UTC (rev 12353) |
| 13 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2008-12-27 18:27:19 UTC (rev 12354) |
| 14 |
@@ -6991,15 +6991,17 @@ |
| 15 |
except KeyError: |
| 16 |
pass |
| 17 |
else: |
| 18 |
+ uninst_task = node |
| 19 |
ignored_uninstall_tasks.add(node) |
| 20 |
break |
| 21 |
|
| 22 |
- # After dropping an Uninstall task, reset |
| 23 |
- # the state variables for leaf node selection and |
| 24 |
- # continue trying to select leaf nodes. |
| 25 |
- prefer_asap = True |
| 26 |
- accept_root_node = False |
| 27 |
- continue |
| 28 |
+ if uninst_task is not None: |
| 29 |
+ # After dropping an Uninstall task, reset |
| 30 |
+ # the state variables for leaf node selection and |
| 31 |
+ # continue trying to select leaf nodes. |
| 32 |
+ prefer_asap = True |
| 33 |
+ accept_root_node = False |
| 34 |
+ continue |
| 35 |
|
| 36 |
if not selected_nodes: |
| 37 |
self._circular_deps_for_display = mygraph |
Archives