| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-27 08:04:12 +0000 (Fri, 27 Jun 2008) |
| 3 |
New Revision: 10812 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Call clear_caches() after the depgraph is out of scope, in MergeTask.merge(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-27 07:49:57 UTC (rev 10811) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-27 08:04:12 UTC (rev 10812) |
| 15 |
@@ -5963,6 +5963,7 @@ |
| 16 |
if not mergelist: |
| 17 |
break |
| 18 |
mylist = self._calc_resume_list() |
| 19 |
+ clear_caches(self.trees) |
| 20 |
if not mylist: |
| 21 |
break |
| 22 |
self.curval += 1 |
| 23 |
@@ -6006,8 +6007,6 @@ |
| 24 |
|
| 25 |
mylist = mydepgraph.altlist() |
| 26 |
mydepgraph.break_refs(mylist) |
| 27 |
- del mydepgraph |
| 28 |
- clear_caches(self.trees) |
| 29 |
return mylist |
| 30 |
|
| 31 |
def _poll_child_processes(self): |
| 32 |
|
| 33 |
-- |
| 34 |
gentoo-commits@l.g.o mailing list |
Archives