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