| 1 |
Author: zmedico |
| 2 |
Date: 2009-01-22 05:55:24 +0000 (Thu, 22 Jan 2009) |
| 3 |
New Revision: 12547 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Inside depgraph.loadResumeCommand(), when appropriate, complete the graph |
| 9 |
before analyzing any unsatisfied deps that may exist. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2009-01-22 02:56:00 UTC (rev 12546) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2009-01-22 05:55:24 UTC (rev 12547) |
| 16 |
@@ -8516,8 +8516,14 @@ |
| 17 |
if not self._create_graph(allow_unsatisfied=True): |
| 18 |
return False |
| 19 |
|
| 20 |
+ # When appropriate, complete the graph before analyzing |
| 21 |
+ # any unsatisfied deps that may exist. |
| 22 |
+ if not self._complete_graph(): |
| 23 |
+ return False |
| 24 |
+ |
| 25 |
unsatisfied_deps = [] |
| 26 |
- for dep in self._unsatisfied_deps: |
| 27 |
+ for dep in self._unsatisfied_deps + \ |
| 28 |
+ self._initially_unsatisfied_deps: |
| 29 |
if not isinstance(dep.parent, Package): |
| 30 |
continue |
| 31 |
if dep.parent.operation == "merge": |
Archives