| 1 |
Author: zmedico |
| 2 |
Date: 2009-02-26 07:50:49 +0000 (Thu, 26 Feb 2009) |
| 3 |
New Revision: 12714 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
In traversing deps to add to Scheduler._unsatisfied_system_deps, only traverse |
| 9 |
completed 'merge' nodes since those are the only ones that need to be checked |
| 10 |
for unsatisfied runtime deps, and it's normal for nodes that aren't yet |
| 11 |
complete to have unsatisfied runtime deps. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/__init__.py 2009-02-26 04:26:07 UTC (rev 12713) |
| 17 |
+++ main/trunk/pym/_emerge/__init__.py 2009-02-26 07:50:49 UTC (rev 12714) |
| 18 |
@@ -10822,8 +10822,15 @@ |
| 19 |
continue |
| 20 |
if child is pkg: |
| 21 |
continue |
| 22 |
- dep_stack.append(child) |
| 23 |
if child.operation == 'merge' and \ |
| 24 |
+ child in completed_tasks: |
| 25 |
+ # When traversing children, only traverse completed |
| 26 |
+ # 'merge' nodes since those are the only ones that need |
| 27 |
+ # to be checked for unsatisfied runtime deps, and it's |
| 28 |
+ # normal for nodes that aren't yet complete to have |
| 29 |
+ # unsatisfied runtime deps. |
| 30 |
+ dep_stack.append(child) |
| 31 |
+ if child.operation == 'merge' and \ |
| 32 |
child not in completed_tasks and \ |
| 33 |
child in unsatisfied_runtime: |
| 34 |
unsatisfied.add(child) |
Archives