| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-31 02:06:01 +0000 (Sat, 31 May 2008) |
| 3 |
New Revision: 10514 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Clean up reference to parts of the first graph for --skipfirst. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-31 01:54:11 UTC (rev 10513) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-31 02:06:01 UTC (rev 10514) |
| 15 |
@@ -8369,13 +8369,13 @@ |
| 16 |
while True: |
| 17 |
mydepgraph = depgraph(settings, trees, |
| 18 |
myopts, myparams, spinner) |
| 19 |
- graph = mydepgraph.digraph |
| 20 |
try: |
| 21 |
success = mydepgraph.loadResumeCommand(mtimedb["resume"]) |
| 22 |
except depgraph.UnsatisfiedResumeDep, e: |
| 23 |
if "--skipfirst" not in myopts: |
| 24 |
raise |
| 25 |
|
| 26 |
+ graph = mydepgraph.digraph |
| 27 |
unsatisfied_parents = dict((dep.parent, dep.parent) \ |
| 28 |
for dep in e.value) |
| 29 |
traversed_nodes = set() |
| 30 |
@@ -8415,7 +8415,8 @@ |
| 31 |
raise |
| 32 |
mergelist[:] = pruned_mergelist |
| 33 |
dropped_tasks.update(unsatisfied_parents) |
| 34 |
- del e, unsatisfied_parents |
| 35 |
+ del e, graph, traversed_nodes, \ |
| 36 |
+ unsatisfied_parents, unsatisfied_stack |
| 37 |
continue |
| 38 |
else: |
| 39 |
break |
| 40 |
|
| 41 |
-- |
| 42 |
gentoo-commits@l.g.o mailing list |
Archives